annotate src/elhash.c @ 231:557eaa0339bf r20-5b14

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