annotate src/elhash.c @ 267:966663fcf606 r20-5b32

Import from CVS: tag r20-5b32
author cvs
date Mon, 13 Aug 2007 10:26:29 +0200
parents 677f6a0ee643
children c5d627a313b1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1 /* Lisp interface to hash tables.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
3 Copyright (C) 1995, 1996 Ben Wing.
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
4 Copyright (C) 1997 Free Software Foundation, Inc.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
5
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
6 This file is part of XEmacs.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
7
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
8 XEmacs is free software; you can redistribute it and/or modify it
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
10 Free Software Foundation; either version 2, or (at your option) any
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
11 later version.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
12
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
16 for more details.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
17
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
19 along with XEmacs; see the file COPYING. If not, write to
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
21 Boston, MA 02111-1307, USA. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
22
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
23 /* Synched up with: Not in FSF. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
24
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
25 #include <config.h>
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
26 #include "lisp.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
27 #include "hash.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
28 #include "elhash.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
29 #include "bytecode.h"
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
30
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
31 Lisp_Object Qhashtablep, Qhashtable;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
32 Lisp_Object Qweak, Qkey_weak, Qvalue_weak, Qnon_weak;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
33
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
34 #define LISP_OBJECTS_PER_HENTRY (sizeof (hentry) / sizeof (Lisp_Object))/* 2 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
35
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
36 struct hashtable
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
37 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
38 struct lcrecord_header header;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
39 unsigned int fullness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
40 unsigned long (*hash_function) (CONST void *);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
41 int (*test_function) (CONST void *, CONST void *);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
42 Lisp_Object zero_entry;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
43 Lisp_Object harray;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
44 enum hashtable_type type; /* whether and how this hashtable is weak */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
45 Lisp_Object next_weak; /* Used to chain together all of the weak
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
46 hashtables. Don't mark through this. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
47 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
48
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
49 static Lisp_Object Vall_weak_hashtables;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
50
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
51 static Lisp_Object mark_hashtable (Lisp_Object, void (*) (Lisp_Object));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
52 static void print_hashtable (Lisp_Object, Lisp_Object, int);
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
53 static int hashtable_equal (Lisp_Object t1, Lisp_Object t2, int depth);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
54 DEFINE_LRECORD_IMPLEMENTATION ("hashtable", hashtable,
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
55 mark_hashtable, print_hashtable, 0,
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
56 /* #### Implement hashtable_hash()! */
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
57 hashtable_equal, 0,
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
58 struct hashtable);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
59
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
60 static Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
61 mark_hashtable (Lisp_Object obj, void (*markobj) (Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
62 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
63 struct hashtable *table = XHASHTABLE (obj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
64
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
65 if (table->type != HASHTABLE_NONWEAK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
66 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
67 /* If the table is weak, we don't want to mark the keys and values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
68 (we scan over them after everything else has been marked,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
69 and mark or remove them as necessary). Note that we will mark
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
70 the table->harray itself at the same time; it's hard to mark
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
71 that here without also marking its contents. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
72 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
73 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
74 ((markobj) (table->zero_entry));
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
75 return table->harray;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
76 }
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
77
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
78 /* Equality of hashtables. Two hashtables are equal when they are of
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
79 the same type and test function, they have the same number of
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
80 elements, and for each key in hashtable, the values are `equal'.
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
81
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
82 This is similar to Common Lisp `equalp' of hashtables, with the
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
83 difference that CL requires the keys to be compared with the test
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
84 function, which we don't do. Doing that would require consing, and
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
85 consing is bad idea in `equal'. Anyway, our method should provide
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
86 the same result -- if the keys are not equal according to test
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
87 function, then Fgethash() in hashtable_equal_mapper() will fail. */
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
88 struct hashtable_equal_closure
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
89 {
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
90 int depth;
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
91 int equal;
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
92 Lisp_Object other_table;
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
93 };
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
94
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
95 static int
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
96 hashtable_equal_mapper (CONST void *key, void *contents, void *arg)
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
97 {
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
98 struct hashtable_equal_closure *closure =
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
99 (struct hashtable_equal_closure *)arg;
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
100 Lisp_Object keytem, valuetem;
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
101 Lisp_Object value_in_other;
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
102
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
103 CVOID_TO_LISP (keytem, key);
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
104 CVOID_TO_LISP (valuetem, contents);
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
105 /* Look up the key in the other hashtable, and compare the values. */
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
106 value_in_other = Fgethash (keytem, closure->other_table, Qunbound);
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
107 if (UNBOUNDP (value_in_other)
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
108 || !internal_equal (valuetem, value_in_other, closure->depth))
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
109 {
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
110 /* Give up. */
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
111 closure->equal = 0;
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
112 return 1;
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
113 }
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
114 return 0;
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
115 }
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
116
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
117 static int
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
118 hashtable_equal (Lisp_Object t1, Lisp_Object t2, int depth)
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
119 {
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
120 struct hashtable_equal_closure closure;
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
121 struct hashtable *table1 = XHASHTABLE (t1);
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
122 struct hashtable *table2 = XHASHTABLE (t2);
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
123
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
124 /* The objects are `equal' if they are of the same type, so return 0
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
125 if types or test functions are not the same. Obviously, the
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
126 number of elements must be equal, too. #### table->fullness is
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
127 broken, so we cannot use it. */
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
128 if ((table1->test_function != table2->test_function)
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
129 || (table1->type != table2->type)
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
130 /*|| (table1->fullness != table2->fullness))*/
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
131 )
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
132 return 0;
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
133
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
134 closure.depth = depth + 1;
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
135 closure.equal = 1;
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
136 closure.other_table = t2;
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
137 elisp_maphash (hashtable_equal_mapper, t1, &closure);
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
138 return closure.equal;
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
139 }
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
140
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
141 /* Printing hashtables.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
142
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
143 This is non-trivial, because we use a readable structure-style
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
144 syntax for hashtables. This means that a typical hashtable will be
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
145 readably printed in the form of:
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
146
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
147 #s(hashtable size 2 data (key1 value1 key2 value2))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
148
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
149 The supported keywords are `type' (non-weak (or nil), weak,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
150 key-weak and value-weak), `test' (eql (or nil), eq or equal),
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
151 `size' (a natnum or nil) and `data' (a list).
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
152
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
153 If `print-readably' is non-nil, then a simpler syntax is used; for
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
154 instance:
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
155
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
156 #<hashtable size 2/13 data (key1 value1 key2 value2) 0x874d>
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
157
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
158 The data is truncated to four pairs, and the rest is shown with
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
159 `...'. This printer does not cons. */
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
160
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
161 struct print_hashtable_data_closure
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
162 {
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
163 EMACS_INT count; /* Used to implement truncation for
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
164 non-readable printing, as well as
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
165 to avoid the unnecessary space at
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
166 the beginning. */
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
167 Lisp_Object printcharfun;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
168 };
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
169
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
170 static int
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
171 print_hashtable_data_mapper (CONST void *key, void *contents, void *arg)
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
172 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
173 Lisp_Object keytem, valuetem;
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
174 struct print_hashtable_data_closure *closure =
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
175 (struct print_hashtable_data_closure *)arg;
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
176
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
177 if (closure->count < 4 || print_readably)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
178 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
179 CVOID_TO_LISP (keytem, key);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
180 CVOID_TO_LISP (valuetem, contents);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
181
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
182 if (closure->count)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
183 write_c_string (" ", closure->printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
184
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
185 print_internal (keytem, closure->printcharfun, 1);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
186 write_c_string (" ", closure->printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
187 print_internal (valuetem, closure->printcharfun, 1);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
188 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
189 ++closure->count;
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
190 return 0;
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
191 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
192
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
193 /* Print the data of the hashtable. This maps through a Lisp
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
194 hashtable and prints key/value pairs using PRINTCHARFUN. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
195 static void
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
196 print_hashtable_data (Lisp_Object hashtable, Lisp_Object printcharfun)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
197 {
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
198 struct print_hashtable_data_closure closure;
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
199 closure.count = 0;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
200 closure.printcharfun = printcharfun;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
201
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
202 write_c_string (" data (", printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
203 elisp_maphash (print_hashtable_data_mapper, hashtable, &closure);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
204 write_c_string ((!print_readably && closure.count > 4) ? " ...)" : ")",
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
205 printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
206 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
207
251
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
208 /* Needed for tests. */
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
209 static int lisp_object_eql_equal (CONST void *x1, CONST void *x2);
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
210 static int lisp_object_equal_equal (CONST void *x1, CONST void *x2);
677f6a0ee643 Import from CVS: tag r20-5b24
cvs
parents: 243
diff changeset
211
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
212 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
213 print_hashtable (Lisp_Object obj, Lisp_Object printcharfun, int escapeflag)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
214 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
215 struct hashtable *table = XHASHTABLE (obj);
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
216 char buf[128];
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
217
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
218 write_c_string (print_readably ? "#s(hashtable" : "#<hashtable",
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
219 printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
220 if (table->type != HASHTABLE_NONWEAK)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
221 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
222 sprintf (buf, " type %s",
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
223 (table->type == HASHTABLE_WEAK ? "weak" :
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
224 table->type == HASHTABLE_KEY_WEAK ? "key-weak" :
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
225 table->type == HASHTABLE_VALUE_WEAK ? "value-weak" :
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
226 "you-d-better-not-see-this"));
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
227 write_c_string (buf, printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
228 }
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
229 /* These checks have a kludgy look to them, but they are safe. Due
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
230 to nature of hashing, you cannot use arbitrary test functions
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
231 anyway. */
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
232 if (!table->test_function)
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
233 write_c_string (" test eq", printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
234 else if (table->test_function == lisp_object_equal_equal)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
235 write_c_string (" test equal", printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
236 else if (table->test_function == lisp_object_eql_equal)
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
237 DO_NOTHING;
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
238 else
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
239 abort ();
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
240 if (table->fullness || !print_readably)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
241 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
242 if (print_readably)
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
243 sprintf (buf, " size %u", table->fullness);
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
244 else
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
245 sprintf (buf, " size %u/%ld", table->fullness,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
246 XVECTOR_LENGTH (table->harray) / LISP_OBJECTS_PER_HENTRY);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
247 write_c_string (buf, printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
248 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
249 if (table->fullness)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
250 print_hashtable_data (obj, printcharfun);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
251 if (print_readably)
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
252 write_c_string (")", printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
253 else
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
254 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
255 sprintf (buf, " 0x%x>", table->header.uid);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
256 write_c_string (buf, printcharfun);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
257 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
258 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
259
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
260
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
261 /* Pretty reading of hashtables.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
262
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
263 Here we use the existing structures mechanism (which is,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
264 unfortunately, pretty cumbersome) for validating and instantiating
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
265 the hashtables. The idea is that the side-effect of reading a
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
266 #s(hashtable PLIST) object is creation of a hashtable with desired
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
267 properties, and that the hashtable is returned. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
268
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
269 /* Validation functions: each keyword provides its own validation
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
270 function. The errors should maybe be continuable, but it is
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
271 unclear how this would cope with ERRB. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
272 static int
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
273 hashtable_type_validate (Lisp_Object keyword, Lisp_Object value,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
274 Error_behavior errb)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
275 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
276 if (!(NILP (value)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
277 || EQ (value, Qnon_weak)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
278 || EQ (value, Qweak)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
279 || EQ (value, Qkey_weak)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
280 || EQ (value, Qvalue_weak)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
281 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
282 maybe_signal_simple_error ("Invalid hashtable type", value,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
283 Qhashtable, errb);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
284 return 0;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
285 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
286 return 1;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
287 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
288
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
289 static int
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
290 hashtable_test_validate (Lisp_Object keyword, Lisp_Object value,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
291 Error_behavior errb)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
292 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
293 if (!(NILP (value)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
294 || EQ (value, Qeq)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
295 || EQ (value, Qeql)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
296 || EQ (value, Qequal)))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
297 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
298 maybe_signal_simple_error ("Invalid hashtable test", value,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
299 Qhashtable, errb);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
300 return 0;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
301 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
302 return 1;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
303 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
304
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
305 static int
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
306 hashtable_size_validate (Lisp_Object keyword, Lisp_Object value,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
307 Error_behavior errb)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
308 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
309 if (!NATNUMP (value))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
310 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
311 maybe_signal_error (Qwrong_type_argument, list2 (Qnatnump, value),
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
312 Qhashtable, errb);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
313 return 0;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
314 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
315 return 1;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
316 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
317
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
318 static int
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
319 hashtable_data_validate (Lisp_Object keyword, Lisp_Object value,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
320 Error_behavior errb)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
321 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
322 int num = 0;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
323 Lisp_Object tail;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
324
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
325 /* #### Doesn't respect ERRB! */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
326 EXTERNAL_LIST_LOOP (tail, value)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
327 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
328 ++num;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
329 QUIT;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
330 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
331 if (num & 1)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
332 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
333 maybe_signal_simple_error
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
334 ("Hashtable data must have alternating keyword/value pairs", value,
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
335 Qhashtable, errb);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
336 return 0;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
337 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
338 return 1;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
339 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
340
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
341 /* The actual instantiation of hashtable. This does practically no
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
342 error checking, because it relies on the fact that the paranoid
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
343 functions above have error-checked everything to the last details.
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
344 If this assumption is wrong, we will get a crash immediately (with
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
345 error-checking compiled in), and we'll know if there is a bug in
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
346 the structure mechanism. So there. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
347 static Lisp_Object
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
348 hashtable_instantiate (Lisp_Object plist)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
349 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
350 /* I'm not sure whether this can GC, but better safe than sorry. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
351 Lisp_Object hashtab = Qnil;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
352 Lisp_Object type = Qnil, test = Qnil, size = Qnil, data = Qnil;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
353 Lisp_Object key, value;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
354 struct gcpro gcpro1;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
355 GCPRO1 (hashtab);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
356
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
357 while (!NILP (plist))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
358 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
359 key = XCAR (plist);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
360 plist = XCDR (plist);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
361 value = XCAR (plist);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
362 plist = XCDR (plist);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
363 if (EQ (key, Qtype))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
364 type = value;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
365 else if (EQ (key, Qtest))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
366 test = value;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
367 else if (EQ (key, Qsize))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
368 size = value;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
369 else if (EQ (key, Qdata))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
370 data = value;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
371 else
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
372 abort ();
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
373 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
374 if (NILP (type))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
375 type = Qnon_weak;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
376 if (NILP (size))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
377 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
378 /* Divide by two, because data is a plist. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
379 XSETINT (size, XINT (Flength (data)) / 2);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
380 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
381
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
382 /* Create the hashtable. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
383 if (EQ (type, Qnon_weak))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
384 hashtab = Fmake_hashtable (size, test);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
385 else if (EQ (type, Qweak))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
386 hashtab = Fmake_weak_hashtable (size, test);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
387 else if (EQ (type, Qkey_weak))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
388 hashtab = Fmake_key_weak_hashtable (size, test);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
389 else if (EQ (type, Qvalue_weak))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
390 hashtab = Fmake_value_weak_hashtable (size, test);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
391 else
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
392 abort ();
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
393
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
394 /* And fill it with data. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
395 while (!NILP (data))
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
396 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
397 key = XCAR (data);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
398 data = XCDR (data);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
399 value = XCAR (data);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
400 data = XCDR (data);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
401 Fputhash (key, value, hashtab);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
402 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
403
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
404 UNGCPRO;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
405 return hashtab;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
406 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
407
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
408 /* Initialize the hashtable as a structure type. This is called from
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
409 emacs.c. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
410 void
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
411 structure_type_create_hashtable (void)
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
412 {
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
413 struct structure_type *st;
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
414
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
415 st = define_structure_type (Qhashtable, 0, hashtable_instantiate);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
416 define_structure_type_keyword (st, Qtype, hashtable_type_validate);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
417 define_structure_type_keyword (st, Qtest, hashtable_test_validate);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
418 define_structure_type_keyword (st, Qsize, hashtable_size_validate);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
419 define_structure_type_keyword (st, Qdata, hashtable_data_validate);
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
420 }
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
421
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
422 /* Basic conversion and allocation functions. */
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
423
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
424 /* Create a C hashtable from the data in the Lisp hashtable. The
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
425 actual vector is not copied, nor are the keys or values copied. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
426 static void
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
427 ht_copy_to_c (struct hashtable *ht, c_hashtable c_table)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
428 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
429 int len = XVECTOR_LENGTH (ht->harray);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
430
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
431 c_table->harray = (hentry *) XVECTOR_DATA (ht->harray);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
432 c_table->zero_set = (!GC_UNBOUNDP (ht->zero_entry));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
433 c_table->zero_entry = LISP_TO_VOID (ht->zero_entry);
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
434 #ifndef LRECORD_VECTOR
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
435 if (len < 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
436 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
437 /* #### if alloc.c mark_object() changes, this must change too. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
438 /* barf gag retch. When a vector is marked, its len is
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
439 made less than 0. In the prune_weak_hashtables() stage,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
440 we are called on vectors that are like this, and we must
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
441 be able to deal. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
442 assert (gc_in_progress);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
443 len = -1 - len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
444 }
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
445 #endif
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
446 c_table->size = len/LISP_OBJECTS_PER_HENTRY;
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
447 c_table->fullness = ht->fullness;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
448 c_table->hash_function = ht->hash_function;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
449 c_table->test_function = ht->test_function;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
450 XSETHASHTABLE (c_table->elisp_table, ht);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
451 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
452
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
453 static void
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
454 ht_copy_from_c (c_hashtable c_table, struct hashtable *ht)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
455 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
456 struct Lisp_Vector dummy;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
457 /* C is truly hateful */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
458 void *vec_addr
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
459 = ((char *) c_table->harray
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
460 - ((char *) &(dummy.contents[0]) - (char *) &dummy));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
461
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
462 XSETVECTOR (ht->harray, vec_addr);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
463 if (c_table->zero_set)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
464 VOID_TO_LISP (ht->zero_entry, c_table->zero_entry);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
465 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
466 ht->zero_entry = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
467 ht->fullness = c_table->fullness;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
468 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
469
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
470
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
471 static struct hashtable *
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
472 allocate_hashtable (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
473 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
474 struct hashtable *table =
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
475 alloc_lcrecord_type (struct hashtable, lrecord_hashtable);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
476 table->harray = Qnil;
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
477 table->zero_entry = Qunbound;
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
478 table->fullness = 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
479 table->hash_function = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
480 table->test_function = 0;
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
481 return table;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
482 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
483
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
484 void *
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
485 elisp_hvector_malloc (unsigned int bytes, Lisp_Object table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
486 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
487 Lisp_Object new_vector;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
488 struct hashtable *ht = XHASHTABLE (table);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
489
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
490 assert (bytes > XVECTOR_LENGTH (ht->harray) * sizeof (Lisp_Object));
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
491 new_vector = make_vector ((bytes / sizeof (Lisp_Object)), Qnull_pointer);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
492 return (void *) XVECTOR_DATA (new_vector);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
493 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
494
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
495 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
496 elisp_hvector_free (void *ptr, Lisp_Object table)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
497 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
498 struct hashtable *ht = XHASHTABLE (table);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
499 #if defined (USE_ASSERTIONS) || defined (DEBUG_XEMACS)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
500 Lisp_Object current_vector = ht->harray;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
501 #endif
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
502
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
503 assert (((void *) XVECTOR_DATA (current_vector)) == ptr);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
504 ht->harray = Qnil; /* Let GC do its job */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
505 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
506
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
507
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
508 DEFUN ("hashtablep", Fhashtablep, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
509 Return t if OBJ is a hashtable, else nil.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
510 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
511 (obj))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
512 {
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
513 return HASHTABLEP (obj) ? Qt : Qnil;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
514 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
515
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
516
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
517
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
518
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
519 #if 0 /* I don't think these are needed any more.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
520 If using the general lisp_object_equal_*() functions
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
521 causes efficiency problems, these can be resurrected. --ben */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
522 /* equality and hash functions for Lisp strings */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
523 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
524 lisp_string_equal (CONST void *x1, CONST void *x2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
525 {
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
526 /* This is wrong anyway. You can't use strcmp() on Lisp strings,
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
527 because they can contain zero characters. */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
528 Lisp_Object str1, str2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
529 CVOID_TO_LISP (str1, x1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
530 CVOID_TO_LISP (str2, x2);
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 2
diff changeset
531 return !strcmp ((char *) XSTRING_DATA (str1), (char *) XSTRING_DATA (str2));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
532 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
533
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
534 unsigned long
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
535 lisp_string_hash (CONST void *x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
536 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
537 Lisp_Object str;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
538 CVOID_TO_LISP (str, x);
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 2
diff changeset
539 return hash_string (XSTRING_DATA (str), XSTRING_LENGTH (str));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
540 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
541
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
542 #endif /* 0 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
543
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
544 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
545 lisp_object_eql_equal (CONST void *x1, CONST void *x2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
546 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
547 Lisp_Object obj1, obj2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
548 CVOID_TO_LISP (obj1, x1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
549 CVOID_TO_LISP (obj2, x2);
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
550 return FLOATP (obj1) ? internal_equal (obj1, obj2, 0) : EQ (obj1, obj2);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
551 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
552
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
553 static unsigned long
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
554 lisp_object_eql_hash (CONST void *x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
555 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
556 Lisp_Object obj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
557 CVOID_TO_LISP (obj, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
558 if (FLOATP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
559 return internal_hash (obj, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
560 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
561 return LISP_HASH (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
562 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
563
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
564 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
565 lisp_object_equal_equal (CONST void *x1, CONST void *x2)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
566 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
567 Lisp_Object obj1, obj2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
568 CVOID_TO_LISP (obj1, x1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
569 CVOID_TO_LISP (obj2, x2);
195
a2f645c6b9f8 Import from CVS: tag r20-3b24
cvs
parents: 187
diff changeset
570 return internal_equal (obj1, obj2, 0);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
571 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
572
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
573 static unsigned long
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
574 lisp_object_equal_hash (CONST void *x)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
575 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
576 Lisp_Object obj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
577 CVOID_TO_LISP (obj, x);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
578 return internal_hash (obj, 0);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
579 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
580
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
581 Lisp_Object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
582 make_lisp_hashtable (int size,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
583 enum hashtable_type type,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
584 enum hashtable_test_fun test)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
585 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
586 Lisp_Object result;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
587 struct hashtable *table = allocate_hashtable ();
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
588
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
589 table->harray = make_vector ((compute_harray_size (size)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
590 * LISP_OBJECTS_PER_HENTRY),
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
591 Qnull_pointer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
592 switch (test)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
593 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
594 case HASHTABLE_EQ:
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
595 table->test_function = NULL;
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
596 table->hash_function = NULL;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
597 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
598
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
599 case HASHTABLE_EQL:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
600 table->test_function = lisp_object_eql_equal;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
601 table->hash_function = lisp_object_eql_hash;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
602 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
603
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
604 case HASHTABLE_EQUAL:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
605 table->test_function = lisp_object_equal_equal;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
606 table->hash_function = lisp_object_equal_hash;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
607 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
608
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
609 default:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
610 abort ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
611 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
612
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
613 table->type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
614 XSETHASHTABLE (result, table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
615
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
616 if (table->type != HASHTABLE_NONWEAK)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
617 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
618 table->next_weak = Vall_weak_hashtables;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
619 Vall_weak_hashtables = result;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
620 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
621 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
622 table->next_weak = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
623
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
624 return result;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
625 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
626
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
627 static enum hashtable_test_fun
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
628 decode_hashtable_test_fun (Lisp_Object sym)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
629 {
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
630 if (NILP (sym)) return HASHTABLE_EQL;
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
631 if (EQ (sym, Qeq)) return HASHTABLE_EQ;
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
632 if (EQ (sym, Qequal)) return HASHTABLE_EQUAL;
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
633 if (EQ (sym, Qeql)) return HASHTABLE_EQL;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
634
231
557eaa0339bf Import from CVS: tag r20-5b14
cvs
parents: 223
diff changeset
635 signal_simple_error ("Invalid hashtable test function", sym);
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
636 return HASHTABLE_EQ; /* not reached */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
637 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
638
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
639 DEFUN ("make-hashtable", Fmake_hashtable, 1, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
640 Make a hashtable of initial size SIZE.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
641 Comparison between keys is done with TEST-FUN, which must be one of
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
642 `eq', `eql', or `equal'. The default is `eql'; i.e. two keys must
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
643 be the same object (or have the same floating-point value, for floats)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
644 to be considered equivalent.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
645
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
646 See also `make-weak-hashtable', `make-key-weak-hashtable', and
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
647 `make-value-weak-hashtable'.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
648 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
649 (size, test_fun))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
650 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
651 CHECK_NATNUM (size);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
652 return make_lisp_hashtable (XINT (size), HASHTABLE_NONWEAK,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
653 decode_hashtable_test_fun (test_fun));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
654 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
655
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
656 DEFUN ("copy-hashtable", Fcopy_hashtable, 1, 1, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
657 Make a new hashtable which contains the same keys and values
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
658 as the given table. The keys and values will not themselves be copied.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
659 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
660 (old_table))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
661 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
662 struct _C_hashtable old_htbl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
663 struct _C_hashtable new_htbl;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
664 struct hashtable *old_ht;
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
665 struct hashtable *new_ht;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
666 Lisp_Object result;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
667
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
668 CHECK_HASHTABLE (old_table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
669 old_ht = XHASHTABLE (old_table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
670 ht_copy_to_c (old_ht, &old_htbl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
671
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
672 /* we can't just call Fmake_hashtable() here because that will make a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
673 table that is slightly larger than the one we're trying to copy,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
674 which will make copy_hash() blow up. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
675 new_ht = allocate_hashtable ();
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
676 new_ht->fullness = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
677 new_ht->zero_entry = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
678 new_ht->hash_function = old_ht->hash_function;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
679 new_ht->test_function = old_ht->test_function;
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
680 new_ht->harray = Fmake_vector (Flength (old_ht->harray), Qnull_pointer);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
681 ht_copy_to_c (new_ht, &new_htbl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
682 copy_hash (&new_htbl, &old_htbl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
683 ht_copy_from_c (&new_htbl, new_ht);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
684 new_ht->type = old_ht->type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
685 XSETHASHTABLE (result, new_ht);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
686
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
687 if (UNBOUNDP (old_ht->next_weak))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
688 new_ht->next_weak = Qunbound;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
689 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
690 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
691 new_ht->next_weak = Vall_weak_hashtables;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
692 Vall_weak_hashtables = result;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
693 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
694
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
695 return result;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
696 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
697
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
698
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
699 DEFUN ("gethash", Fgethash, 2, 3, 0, /*
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
700 Find hash value for KEY in HASHTABLE.
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
701 If there is no corresponding value, return DEFAULT (defaults to nil).
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
702 */
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
703 (key, hashtable, default_))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
704 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
705 CONST void *vval;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
706 struct _C_hashtable htbl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
707 if (!gc_in_progress)
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
708 CHECK_HASHTABLE (hashtable);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
709 ht_copy_to_c (XHASHTABLE (hashtable), &htbl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
710 if (gethash (LISP_TO_VOID (key), &htbl, &vval))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
711 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
712 Lisp_Object val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
713 CVOID_TO_LISP (val, vval);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
714 return val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
715 }
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
716 else
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
717 return default_;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
718 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
719
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
720
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
721 DEFUN ("remhash", Fremhash, 2, 2, 0, /*
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
722 Remove hash value for KEY in HASHTABLE.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
723 */
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
724 (key, hashtable))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
725 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
726 struct _C_hashtable htbl;
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
727 CHECK_HASHTABLE (hashtable);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
728
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
729 ht_copy_to_c (XHASHTABLE (hashtable), &htbl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
730 remhash (LISP_TO_VOID (key), &htbl);
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
731 ht_copy_from_c (&htbl, XHASHTABLE (hashtable));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
732 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
733 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
734
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
735
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
736 DEFUN ("puthash", Fputhash, 3, 3, 0, /*
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
737 Hash KEY to VAL in HASHTABLE.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
738 */
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
739 (key, val, hashtable))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
740 {
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
741 struct hashtable *ht;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
742 void *vkey = LISP_TO_VOID (key);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
743
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
744 CHECK_HASHTABLE (hashtable);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
745 ht = XHASHTABLE (hashtable);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
746 if (!vkey)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
747 ht->zero_entry = val;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
748 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
749 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
750 struct gcpro gcpro1, gcpro2, gcpro3;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
751 struct _C_hashtable htbl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
752
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
753 ht_copy_to_c (XHASHTABLE (hashtable), &htbl);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
754 GCPRO3 (key, val, hashtable);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
755 puthash (vkey, LISP_TO_VOID (val), &htbl);
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
756 ht_copy_from_c (&htbl, XHASHTABLE (hashtable));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
757 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
758 }
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
759 return val;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
760 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
761
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
762 DEFUN ("clrhash", Fclrhash, 1, 1, 0, /*
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
763 Remove all entries from HASHTABLE.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
764 */
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
765 (hashtable))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
766 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
767 struct _C_hashtable htbl;
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
768 CHECK_HASHTABLE (hashtable);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
769 ht_copy_to_c (XHASHTABLE (hashtable), &htbl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
770 clrhash (&htbl);
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
771 ht_copy_from_c (&htbl, XHASHTABLE (hashtable));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
772 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
773 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
774
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
775 DEFUN ("hashtable-fullness", Fhashtable_fullness, 1, 1, 0, /*
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
776 Return number of entries in HASHTABLE.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
777 */
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
778 (hashtable))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
779 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
780 struct _C_hashtable htbl;
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
781 CHECK_HASHTABLE (hashtable);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
782 ht_copy_to_c (XHASHTABLE (hashtable), &htbl);
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
783 return make_int (htbl.fullness);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
784 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
785
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
786 DEFUN ("hashtable-type", Fhashtable_type, 1, 1, 0, /*
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
787 Return type of HASHTABLE.
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
788 This can be one of `non-weak', `weak', `key-weak' and `value-weak'.
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
789 */
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
790 (hashtable))
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
791 {
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
792 CHECK_HASHTABLE (hashtable);
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
793
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
794 switch (XHASHTABLE (hashtable)->type)
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
795 {
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
796 case HASHTABLE_WEAK:
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
797 return Qweak;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
798 break;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
799 case HASHTABLE_KEY_WEAK:
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
800 return Qkey_weak;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
801 break;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
802 case HASHTABLE_VALUE_WEAK:
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
803 return Qvalue_weak;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
804 break;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
805 default:
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
806 return Qnon_weak;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
807 }
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
808 }
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
809
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
810 DEFUN ("hashtable-test-function", Fhashtable_test_function, 1, 1, 0, /*
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
811 Return test function of HASHTABLE.
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
812 This can be one of `eq', `eql' or `equal'.
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
813 */
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
814 (hashtable))
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
815 {
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
816 int (*fun) (CONST void *, CONST void *);
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
817
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
818 CHECK_HASHTABLE (hashtable);
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
819
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
820 fun = XHASHTABLE (hashtable)->test_function;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
821
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
822 if (fun == lisp_object_eql_equal)
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
823 return Qeql;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
824 else if (fun == lisp_object_equal_equal)
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
825 return Qequal;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
826 else
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
827 return Qeq;
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
828 }
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
829
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
830 static void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
831 verify_function (Lisp_Object function, CONST char *description)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
832 {
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
833 /* #### Unused DESCRIPTION? */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
834 if (SYMBOLP (function))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
835 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
836 if (NILP (function))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
837 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
838 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
839 function = indirect_function (function, 1);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
840 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
841 if (SUBRP (function) || COMPILED_FUNCTIONP (function))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
842 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
843 else if (CONSP (function))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
844 {
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
845 Lisp_Object funcar = XCAR (function);
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
846 if ((SYMBOLP (funcar)) && (EQ (funcar, Qlambda) ||
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
847 EQ (funcar, Qautoload)))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
848 return;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
849 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
850 signal_error (Qinvalid_function, list1 (function));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
851 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
852
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
853 static int
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
854 lisp_maphash_function (CONST void *void_key,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
855 void *void_val,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
856 void *void_fn)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
857 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
858 /* This function can GC */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
859 Lisp_Object key, val, fn;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
860 CVOID_TO_LISP (key, void_key);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
861 VOID_TO_LISP (val, void_val);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
862 VOID_TO_LISP (fn, void_fn);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
863 call2 (fn, key, val);
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
864 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
865 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
866
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
867
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
868 DEFUN ("maphash", Fmaphash, 2, 2, 0, /*
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
869 Map FUNCTION over entries in HASHTABLE, calling it with two args,
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
870 each key and value in the table.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
871 */
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
872 (function, hashtable))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
873 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
874 struct _C_hashtable htbl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
875 struct gcpro gcpro1, gcpro2;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
876
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
877 verify_function (function, GETTEXT ("hashtable mapping function"));
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
878 CHECK_HASHTABLE (hashtable);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
879 ht_copy_to_c (XHASHTABLE (hashtable), &htbl);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
880 GCPRO2 (hashtable, function);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
881 maphash (lisp_maphash_function, &htbl, LISP_TO_VOID (function));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
882 UNGCPRO;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
883 return Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
884 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
885
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
886
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
887 /* This function is for mapping a *C* function over the elements of a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
888 lisp hashtable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
889 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
890 void
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
891 elisp_maphash (int (*function) (CONST void *key, void *contents,
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
892 void *extra_arg),
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
893 Lisp_Object hashtable, void *closure)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
894 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
895 struct _C_hashtable htbl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
896
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
897 if (!gc_in_progress) CHECK_HASHTABLE (hashtable);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
898 ht_copy_to_c (XHASHTABLE (hashtable), &htbl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
899 maphash (function, &htbl, closure);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
900 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
901
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
902 void
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
903 elisp_map_remhash (int (*function) (CONST void *key,
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
904 CONST void *contents,
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
905 void *extra_arg),
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
906 Lisp_Object hashtable,
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
907 void *closure)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
908 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
909 struct _C_hashtable htbl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
910
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
911 if (!gc_in_progress) CHECK_HASHTABLE (hashtable);
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
912 ht_copy_to_c (XHASHTABLE (hashtable), &htbl);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
913 map_remhash (function, &htbl, closure);
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
914 ht_copy_from_c (&htbl, XHASHTABLE (hashtable));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
915 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
916
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
917 #if 0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
918 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
919 elisp_table_op (Lisp_Object table, generic_hashtable_op op, void *arg1,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
920 void *arg2, void *arg3)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
921 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
922 struct _C_hashtable htbl;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
923 CHECK_HASHTABLE (table);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
924 ht_copy_to_c (XHASHTABLE (table), &htbl);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
925 (*op) (&htbl, arg1, arg2, arg3);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
926 ht_copy_from_c (&htbl, XHASHTABLE (table));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
927 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
928 #endif /* 0 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
929
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
930
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
931
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
932 DEFUN ("make-weak-hashtable", Fmake_weak_hashtable, 1, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
933 Make a fully weak hashtable of initial size SIZE.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
934 A weak hashtable is one whose pointers do not count as GC referents:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
935 for any key-value pair in the hashtable, if the only remaining pointer
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
936 to either the key or the value is in a weak hash table, then the pair
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
937 will be removed from the table, and the key and value collected. A
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
938 non-weak hash table (or any other pointer) would prevent the object
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
939 from being collected.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
940
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
941 You can also create semi-weak hashtables; see `make-key-weak-hashtable'
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
942 and `make-value-weak-hashtable'.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
943 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
944 (size, test_fun))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
945 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
946 CHECK_NATNUM (size);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
947 return make_lisp_hashtable (XINT (size), HASHTABLE_WEAK,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
948 decode_hashtable_test_fun (test_fun));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
949 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
950
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
951 DEFUN ("make-key-weak-hashtable", Fmake_key_weak_hashtable, 1, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
952 Make a key-weak hashtable of initial size SIZE.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
953 A key-weak hashtable is similar to a fully-weak hashtable (see
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
954 `make-weak-hashtable') except that a key-value pair will be removed
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
955 only if the key remains unmarked outside of weak hashtables. The pair
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
956 will remain in the hashtable if the key is pointed to by something other
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
957 than a weak hashtable, even if the value is not.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
958 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
959 (size, test_fun))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
960 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
961 CHECK_NATNUM (size);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
962 return make_lisp_hashtable (XINT (size), HASHTABLE_KEY_WEAK,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
963 decode_hashtable_test_fun (test_fun));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
964 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
965
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
966 DEFUN ("make-value-weak-hashtable", Fmake_value_weak_hashtable, 1, 2, 0, /*
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
967 Make a value-weak hashtable of initial size SIZE.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
968 A value-weak hashtable is similar to a fully-weak hashtable (see
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
969 `make-weak-hashtable') except that a key-value pair will be removed only
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
970 if the value remains unmarked outside of weak hashtables. The pair will
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
971 remain in the hashtable if the value is pointed to by something other
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
972 than a weak hashtable, even if the key is not.
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
973 */
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
974 (size, test_fun))
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
975 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
976 CHECK_NATNUM (size);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
977 return make_lisp_hashtable (XINT (size), HASHTABLE_VALUE_WEAK,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
978 decode_hashtable_test_fun (test_fun));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
979 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
980
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
981 struct marking_closure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
982 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
983 int (*obj_marked_p) (Lisp_Object);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
984 void (*markobj) (Lisp_Object);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
985 enum hashtable_type type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
986 int did_mark;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
987 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
988
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
989 static int
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
990 marking_mapper (CONST void *key, void *contents, void *closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
991 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
992 Lisp_Object keytem, valuetem;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
993 struct marking_closure *fmh =
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
994 (struct marking_closure *) closure;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
995
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
996 /* This function is called over each pair in the hashtable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
997 We complete the marking for semi-weak hashtables. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
998 CVOID_TO_LISP (keytem, key);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
999 CVOID_TO_LISP (valuetem, contents);
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
1000
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1001 switch (fmh->type)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1002 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1003 case HASHTABLE_KEY_WEAK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1004 if ((fmh->obj_marked_p) (keytem) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1005 !(fmh->obj_marked_p) (valuetem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1006 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1007 (fmh->markobj) (valuetem);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1008 fmh->did_mark = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1009 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1010 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1011
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1012 case HASHTABLE_VALUE_WEAK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1013 if ((fmh->obj_marked_p) (valuetem) &&
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1014 !(fmh->obj_marked_p) (keytem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1015 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1016 (fmh->markobj) (keytem);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1017 fmh->did_mark = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1018 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1019 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1020
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1021 case HASHTABLE_KEY_CAR_WEAK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1022 if (!CONSP (keytem) || (fmh->obj_marked_p) (XCAR (keytem)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1023 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1024 if (!(fmh->obj_marked_p) (keytem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1025 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1026 (fmh->markobj) (keytem);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1027 fmh->did_mark = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1028 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1029 if (!(fmh->obj_marked_p) (valuetem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1030 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1031 (fmh->markobj) (valuetem);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1032 fmh->did_mark = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1033 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1034 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1035 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1036
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1037 case HASHTABLE_VALUE_CAR_WEAK:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1038 if (!CONSP (valuetem) || (fmh->obj_marked_p) (XCAR (valuetem)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1039 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1040 if (!(fmh->obj_marked_p) (keytem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1041 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1042 (fmh->markobj) (keytem);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1043 fmh->did_mark = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1044 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1045 if (!(fmh->obj_marked_p) (valuetem))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1046 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1047 (fmh->markobj) (valuetem);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1048 fmh->did_mark = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1049 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1050 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1051 break;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1052
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1053 default:
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1054 abort (); /* Huh? */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1055 }
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
1056
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1057 return 0;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1058 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1059
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1060 int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1061 finish_marking_weak_hashtables (int (*obj_marked_p) (Lisp_Object),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1062 void (*markobj) (Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1063 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1064 Lisp_Object rest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1065 int did_mark = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1066
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1067 for (rest = Vall_weak_hashtables;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1068 !GC_NILP (rest);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1069 rest = XHASHTABLE (rest)->next_weak)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1070 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1071 enum hashtable_type type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1072
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1073 if (! ((*obj_marked_p) (rest)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1074 /* The hashtable is probably garbage. Ignore it. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1075 continue;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1076 type = XHASHTABLE (rest)->type;
187
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
1077 if (type == HASHTABLE_KEY_WEAK ||
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
1078 type == HASHTABLE_VALUE_WEAK ||
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
1079 type == HASHTABLE_KEY_CAR_WEAK ||
b405438285a2 Import from CVS: tag r20-3b20
cvs
parents: 185
diff changeset
1080 type == HASHTABLE_VALUE_CAR_WEAK)
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1081 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1082 struct marking_closure fmh;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1083
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1084 fmh.obj_marked_p = obj_marked_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1085 fmh.markobj = markobj;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1086 fmh.type = type;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1087 fmh.did_mark = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1088 /* Now, scan over all the pairs. For all pairs that are
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1089 half-marked, we may need to mark the other half if we're
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1090 keeping this pair. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1091 elisp_maphash (marking_mapper, rest, &fmh);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1092 if (fmh.did_mark)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1093 did_mark = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1094 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1095
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1096 /* #### If alloc.c mark_object changes, this must change also... */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1097 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1098 /* Now mark the vector itself. (We don't need to call markobj
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1099 here because we know that everything *in* it is already marked,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1100 we just need to prevent the vector itself from disappearing.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1101 (The remhash above has taken care of zero_entry.)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1102 */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1103 struct Lisp_Vector *ptr = XVECTOR (XHASHTABLE (rest)->harray);
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
1104 #ifdef LRECORD_VECTOR
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
1105 if (! MARKED_RECORD_P(XHASHTABLE(rest)->harray))
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
1106 {
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
1107 MARK_RECORD_HEADER(&(ptr->header.lheader));
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
1108 did_mark = 1;
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
1109 }
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
1110 #else
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
1111 int len = vector_length (ptr);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1112 if (len >= 0)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1113 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1114 ptr->size = -1 - len;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1115 did_mark = 1;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1116 }
207
e45d5e7c476e Import from CVS: tag r20-4b2
cvs
parents: 195
diff changeset
1117 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1118 /* else it's already marked (remember, this function is iterated
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1119 until marking stops) */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1120 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1121 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1122
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1123 return did_mark;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1124 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1125
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1126 struct pruning_closure
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1127 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1128 int (*obj_marked_p) (Lisp_Object);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1129 };
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1130
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1131 static int
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1132 pruning_mapper (CONST void *key, CONST void *contents, void *closure)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1133 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1134 Lisp_Object keytem, valuetem;
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
1135 struct pruning_closure *fmh = (struct pruning_closure *) closure;
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1136
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1137 /* This function is called over each pair in the hashtable.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1138 We remove the pairs that aren't completely marked (everything
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1139 that is going to stay ought to have been marked already
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1140 by the finish_marking stage). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1141 CVOID_TO_LISP (keytem, key);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1142 CVOID_TO_LISP (valuetem, contents);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1143
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
1144 return ! ((*fmh->obj_marked_p) (keytem) &&
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
1145 (*fmh->obj_marked_p) (valuetem));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1146 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1147
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1148 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1149 prune_weak_hashtables (int (*obj_marked_p) (Lisp_Object))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1150 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1151 Lisp_Object rest, prev = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1152 for (rest = Vall_weak_hashtables;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1153 !GC_NILP (rest);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1154 rest = XHASHTABLE (rest)->next_weak)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1155 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1156 if (! ((*obj_marked_p) (rest)))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1157 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1158 /* This table itself is garbage. Remove it from the list. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1159 if (GC_NILP (prev))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1160 Vall_weak_hashtables = XHASHTABLE (rest)->next_weak;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1161 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1162 XHASHTABLE (prev)->next_weak = XHASHTABLE (rest)->next_weak;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1163 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1164 else
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1165 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1166 struct pruning_closure fmh;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1167 fmh.obj_marked_p = obj_marked_p;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1168 /* Now, scan over all the pairs. Remove all of the pairs
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1169 in which the key or value, or both, is unmarked
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1170 (depending on the type of weak hashtable). */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1171 elisp_map_remhash (pruning_mapper, rest, &fmh);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1172 prev = rest;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1173 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1174 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1175 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1176
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1177 /* Return a hash value for an array of Lisp_Objects of size SIZE. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1178
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1179 unsigned long
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1180 internal_array_hash (Lisp_Object *arr, int size, int depth)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1181 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1182 int i;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1183 unsigned long hash = 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1184
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1185 if (size <= 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1186 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1187 for (i = 0; i < size; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1188 hash = HASH2 (hash, internal_hash (arr[i], depth + 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1189 return hash;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1190 }
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
1191
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1192 /* just pick five elements scattered throughout the array.
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1193 A slightly better approach would be to offset by some
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1194 noise factor from the points chosen below. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1195 for (i = 0; i < 5; i++)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1196 hash = HASH2 (hash, internal_hash (arr[i*size/5], depth + 1));
185
3d6bfa290dbd Import from CVS: tag r20-3b19
cvs
parents: 173
diff changeset
1197
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1198 return hash;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1199 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1200
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1201 /* Return a hash value for a Lisp_Object. This is for use when hashing
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1202 objects with the comparison being `equal' (for `eq', you can just
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1203 use the Lisp_Object itself as the hash value). You need to make a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1204 tradeoff between the speed of the hash function and how good the
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1205 hashing is. In particular, the hash function needs to be FAST,
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1206 so you can't just traipse down the whole tree hashing everything
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1207 together. Most of the time, objects will differ in the first
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1208 few elements you hash. Thus, we only go to a short depth (5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1209 and only hash at most 5 elements out of a vector. Theoretically
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1210 we could still take 5^5 time (a big big number) to compute a
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1211 hash, but practically this won't ever happen. */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1212
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1213 unsigned long
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1214 internal_hash (Lisp_Object obj, int depth)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1215 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1216 if (depth > 5)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1217 return 0;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1218 if (CONSP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1219 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1220 /* no point in worrying about tail recursion, since we're not
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1221 going very deep */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1222 return HASH2 (internal_hash (XCAR (obj), depth + 1),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1223 internal_hash (XCDR (obj), depth + 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1224 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1225 else if (STRINGP (obj))
14
9ee227acff29 Import from CVS: tag r19-15b90
cvs
parents: 2
diff changeset
1226 return hash_string (XSTRING_DATA (obj), XSTRING_LENGTH (obj));
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1227 else if (VECTORP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1228 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1229 struct Lisp_Vector *v = XVECTOR (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1230 return HASH2 (vector_length (v),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1231 internal_array_hash (v->contents, vector_length (v),
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1232 depth + 1));
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1233 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1234 else if (LRECORDP (obj))
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1235 {
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1236 CONST struct lrecord_implementation
211
78478c60bfcd Import from CVS: tag r20-4b4
cvs
parents: 207
diff changeset
1237 *imp = XRECORD_LHEADER_IMPLEMENTATION (obj);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1238 if (imp->hash)
173
8eaf7971accc Import from CVS: tag r20-3b13
cvs
parents: 153
diff changeset
1239 return (imp->hash) (obj, depth);
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1240 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1241
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1242 return LISP_HASH (obj);
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1243 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1244
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1245 #if 0
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1246 xxDEFUN ("internal-hash-value", Finternal_hash_value, 1, 1, 0, /*
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1247 Hash value of OBJECT. For debugging.
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1248 The value is returned as (HIGH . LOW).
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1249 */
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1250 (object))
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1251 {
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1252 /* This function is pretty 32bit-centric. */
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1253 unsigned long hash = internal_hash (object, 0);
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1254 return Fcons (hash >> 16, hash & 0xffff);
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1255 }
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1256 #endif
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1257
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1258
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1259 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1260 /* initialization */
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1261 /************************************************************************/
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1262
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1263 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1264 syms_of_elhash (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1265 {
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1266 DEFSUBR (Fmake_hashtable);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1267 DEFSUBR (Fcopy_hashtable);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1268 DEFSUBR (Fhashtablep);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1269 DEFSUBR (Fgethash);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1270 DEFSUBR (Fputhash);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1271 DEFSUBR (Fremhash);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1272 DEFSUBR (Fclrhash);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1273 DEFSUBR (Fmaphash);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1274 DEFSUBR (Fhashtable_fullness);
243
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
1275 DEFSUBR (Fhashtable_type);
f220cc83d72e Import from CVS: tag r20-5b20
cvs
parents: 241
diff changeset
1276 DEFSUBR (Fhashtable_test_function);
20
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1277 DEFSUBR (Fmake_weak_hashtable);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1278 DEFSUBR (Fmake_key_weak_hashtable);
859a2309aef8 Import from CVS: tag r19-15b93
cvs
parents: 14
diff changeset
1279 DEFSUBR (Fmake_value_weak_hashtable);
241
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1280 #if 0
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1281 DEFSUBR (Finternal_hash_value);
f955c73f5258 Import from CVS: tag r20-5b19
cvs
parents: 231
diff changeset
1282 #endif
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1283 defsymbol (&Qhashtablep, "hashtablep");
223
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
1284 defsymbol (&Qhashtable, "hashtable");
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
1285 defsymbol (&Qweak, "weak");
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
1286 defsymbol (&Qkey_weak, "key-weak");
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
1287 defsymbol (&Qvalue_weak, "value-weak");
2c611d1463a6 Import from CVS: tag r20-4b10
cvs
parents: 211
diff changeset
1288 defsymbol (&Qnon_weak, "non-weak");
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1289 }
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1290
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1291 void
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1292 vars_of_elhash (void)
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1293 {
2
ac2d302a0011 Import from CVS: tag r19-15b2
cvs
parents: 0
diff changeset
1294 /* This must NOT be staticpro'd */
0
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1295 Vall_weak_hashtables = Qnil;
376386a54a3c Import from CVS: tag r19-14
cvs
parents:
diff changeset
1296 }