author | Claus Gittinger <cg@exept.de> |
Fri, 19 Apr 1996 12:47:25 +0200 | |
changeset 1221 | 46d72af387e9 |
parent 1146 | edadea7273b6 |
child 1233 | 21452b1c61eb |
permissions | -rw-r--r-- |
1 | 1 |
" |
5 | 2 |
COPYRIGHT (c) 1991 by Claus Gittinger |
155 | 3 |
All Rights Reserved |
1 | 4 |
|
5 |
This software is furnished under a license and may be used |
|
6 |
only in accordance with the terms of that license and with the |
|
7 |
inclusion of the above copyright notice. This software may not |
|
8 |
be provided or otherwise made available to, or used by, any |
|
9 |
other person. No title to or ownership of the software is |
|
10 |
hereby transferred. |
|
11 |
" |
|
12 |
||
12 | 13 |
Set subclass:#Dictionary |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
14 |
instanceVariableNames:'valueArray' |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
15 |
classVariableNames:'' |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
16 |
poolDictionaries:'' |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
17 |
category:'Collections-Unordered' |
1 | 18 |
! |
19 |
||
68 | 20 |
!Dictionary class methodsFor:'documentation'! |
21 |
||
88 | 22 |
copyright |
23 |
" |
|
24 |
COPYRIGHT (c) 1991 by Claus Gittinger |
|
155 | 25 |
All Rights Reserved |
88 | 26 |
|
27 |
This software is furnished under a license and may be used |
|
28 |
only in accordance with the terms of that license and with the |
|
29 |
inclusion of the above copyright notice. This software may not |
|
30 |
be provided or otherwise made available to, or used by, any |
|
31 |
other person. No title to or ownership of the software is |
|
32 |
hereby transferred. |
|
33 |
" |
|
34 |
! |
|
35 |
||
68 | 36 |
documentation |
37 |
" |
|
38 |
a Dictionary is (conceptionally) a set of Associations storing key-value pairs. |
|
39 |
(The implementation uses two arrays to store the keys and values separately.) |
|
40 |
Searching for an element is done using a hash into the key array. |
|
362 | 41 |
Another way of looking at a dictionary is as a array which uses |
345 | 42 |
arbitrary access keys (i.e. not just integers as arrays do). |
43 |
||
44 |
Since the keys are unordered, no internal element order is defined |
|
362 | 45 |
(i.e. enumerating them may return elements in any order - even changing |
345 | 46 |
over time). |
47 |
||
68 | 48 |
Many methods for searching and hashing are inherited from Set. |
92 | 49 |
|
50 |
Instance variables: |
|
345 | 51 |
|
155 | 52 |
keyArray <Array> (from Set) the keys |
53 |
valueArray <Array> the values ('valueArray at:index' corresponds |
|
54 |
to the value stored under 'keyArray at:index') |
|
92 | 55 |
|
345 | 56 |
Performance hints: |
362 | 57 |
since the dictionary does not really store associations internally, |
58 |
it is less efficient, to store/retrieve associations. The reason is |
|
399 | 59 |
that these assocs are created temporarily in some extract methods. |
345 | 60 |
I.e. 'at:key put:value' is faster than 'add:anAssoc' |
61 |
and 'keysAndValuesDo:' is faster than 'associationsDo:' etc. |
|
92 | 62 |
|
362 | 63 |
If only symbols or smallIntegers are used as keys, use IdentityDictionaries |
64 |
for slightly better performance, since both hashing and comparison is faster. |
|
345 | 65 |
|
66 |
If you have a rough idea how big the dictionary is going to grow, |
|
67 |
create it using #new: instead of #new. Even if the size given is a |
|
68 |
poor guess (say half of the real size), there is some 20-30% performance |
|
69 |
win to expect, since many resizing operations are avoided when associations |
|
70 |
are added. |
|
362 | 71 |
|
72 |
See also: Set, IdentityDictionary, IdentitySet, WeakIdentitySet and |
|
73 |
WeakIdentityDictionary |
|
68 | 74 |
" |
75 |
! ! |
|
76 |
||
345 | 77 |
!Dictionary class methodsFor:'instance creation'! |
78 |
||
357 | 79 |
withKeys:keyArray andValues:valueArray |
80 |
"return a new instance where keys and values are taken from |
|
81 |
the argumentArrays." |
|
82 |
||
83 |
|newDict sz "{ Class: SmallInteger }"| |
|
84 |
||
85 |
sz := keyArray size. |
|
86 |
newDict := self new:sz. |
|
87 |
keyArray with:valueArray do:[:key :value | |
|
88 |
newDict at:key put:value |
|
89 |
]. |
|
90 |
^ newDict |
|
91 |
||
92 |
" |
|
93 |
Dictionary withKeys:#('one' 'two' 'three' 'four') |
|
94 |
andValues:#(1 2 3 4) |
|
95 |
" |
|
54 | 96 |
! |
97 |
||
609 | 98 |
withKeysAndValues:anArray |
99 |
"return a new instance where keys and values are taken from alternating |
|
100 |
elements of anArray" |
|
54 | 101 |
|
609 | 102 |
|newDict sz "{ Class: SmallInteger }"| |
345 | 103 |
|
609 | 104 |
sz := anArray size. |
105 |
newDict := self new:(sz // 2). |
|
106 |
1 to:sz by:2 do:[:i | |
|
107 |
newDict at:(anArray at:i) put:(anArray at:i+1) |
|
108 |
]. |
|
109 |
^ newDict |
|
345 | 110 |
|
609 | 111 |
" |
112 |
Dictionary withKeysAndValues:#('one' 1 'two' 2 'three' 3 'four' 4) |
|
113 |
" |
|
1 | 114 |
! ! |
115 |
||
116 |
!Dictionary methodsFor:'accessing'! |
|
117 |
||
609 | 118 |
associationAt:aKey |
119 |
"return an association consisting of aKey and the element indexed |
|
120 |
by aKey - |
|
121 |
report an error, if no element is stored under aKey" |
|
122 |
||
123 |
^ aKey -> (self at:aKey) |
|
124 |
! |
|
125 |
||
126 |
associationAt:aKey ifAbsent:exceptionBlock |
|
127 |
"return an association consisting of aKey and the element indexed by aKey - |
|
128 |
return result of exceptionBlock if no element is stored under aKey" |
|
129 |
||
130 |
^ aKey -> (self at:aKey ifAbsent:[^ exceptionBlock value]) |
|
131 |
! |
|
132 |
||
133 |
associations |
|
134 |
"return an ordered collection containing the receivers associations." |
|
135 |
||
136 |
|coll| |
|
137 |
||
138 |
coll := OrderedCollection new:(keyArray size). |
|
139 |
self associationsDo:[:assoc | coll add:assoc]. |
|
140 |
^ coll |
|
141 |
! |
|
142 |
||
1 | 143 |
at:aKey |
144 |
"return the element indexed by aKey - report an error if none found" |
|
145 |
||
146 |
|index| |
|
147 |
||
148 |
aKey isNil ifTrue:[ |
|
362 | 149 |
"/ nil is not allowed as key |
345 | 150 |
^ self errorInvalidKey:aKey |
155 | 151 |
]. |
362 | 152 |
|
153 |
"/ |
|
154 |
"/ I could have written: |
|
155 |
"/ index := self find:aKey ifAbsent:[^ self errorKeyNotFound:aKey] |
|
156 |
"/ but the code below is slighlty more efficient, since it avoids |
|
1146 | 157 |
"/ a block creation - thus speeding up the good case. |
362 | 158 |
|
159 |
index := self find:aKey ifAbsent:0. |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
160 |
index ~~ 0 ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
161 |
^ valueArray basicAt:index |
155 | 162 |
]. |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
163 |
"no such key" |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
164 |
^ self errorKeyNotFound:aKey |
1 | 165 |
! |
166 |
||
167 |
at:aKey ifAbsent:exceptionBlock |
|
2 | 168 |
"return the element indexed by aKey - |
68 | 169 |
return result of exceptionBlock if no element is stored under aKey" |
2 | 170 |
|
1 | 171 |
|index| |
172 |
||
173 |
aKey isNil ifTrue:[ |
|
362 | 174 |
"/ nil is not allowed as key |
175 |
"/ |
|
176 |
"/ previous versions of ST/X raised an error |
|
177 |
"/ here. However, there seem to exist applications |
|
178 |
"/ which depend on getting the exceptionBlocks value |
|
179 |
"/ in this case ... well ... |
|
180 |
"/ ^ self errorInvalidKey:aKey |
|
181 |
^ exceptionBlock value |
|
155 | 182 |
]. |
362 | 183 |
|
184 |
"/ I could have written: |
|
185 |
"/ index := self find:aKey ifAbsent:[^ exceptionBlock value] |
|
186 |
"/ but the code below is slighlty more efficient, since it avoids |
|
1146 | 187 |
"/ a block creation - thus speeding up the good case. |
362 | 188 |
|
189 |
index := self find:aKey ifAbsent:0. |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
190 |
index ~~ 0 ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
191 |
^ valueArray basicAt:index |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
192 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
193 |
^ exceptionBlock value. |
1 | 194 |
! |
195 |
||
196 |
at:aKey put:anObject |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
197 |
"add the argument anObject under key, aKey to the receiver. |
1221 | 198 |
Return anObject (sigh). |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
199 |
WARNING: do not add elements while iterating over the receiver. |
1221 | 200 |
Iterate over a copy to do this." |
1 | 201 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
202 |
|index "{ Class: SmallInteger }" | |
1 | 203 |
|
204 |
aKey isNil ifTrue:[ |
|
1221 | 205 |
"nil is not allowed as key" |
206 |
self errorInvalidKey:aKey |
|
1 | 207 |
] ifFalse:[ |
1221 | 208 |
index := self findKeyOrNil:aKey. |
209 |
(valueArray basicAt:index) notNil ifTrue:[ |
|
210 |
valueArray basicAt:index put:anObject. |
|
211 |
^ anObject |
|
212 |
]. |
|
213 |
keyArray basicAt:index put:aKey. |
|
214 |
valueArray basicAt:index put:anObject. |
|
215 |
tally := tally + 1. |
|
1 | 216 |
|
1221 | 217 |
self fullCheck. |
362 | 218 |
]. |
219 |
^ anObject |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
220 |
|
1221 | 221 |
"Modified: 19.4.1996 / 11:19:45 / cg" |
1 | 222 |
! |
223 |
||
609 | 224 |
keyAtEqualValue:aValue |
225 |
"return the key whose value is equal (i.e. using #= for compare) |
|
226 |
to the argument, nil if none found. |
|
227 |
This is a slow access, since there is no fast reverse mapping. |
|
228 |
NOTICE: |
|
229 |
The value is searched using equality compare; |
|
230 |
use #keyAtValue: to compare for identity." |
|
77 | 231 |
|
609 | 232 |
^ self keyAtEqualValue:aValue ifAbsent:[nil] |
10 | 233 |
! |
234 |
||
609 | 235 |
keyAtEqualValue:aValue ifAbsent:exceptionBlock |
236 |
"return the key whose value is equal (i.e. using #= for compare) |
|
237 |
to the argument, if not found, return the value of exceptionBlock. |
|
238 |
This is a slow access, since there is no fast reverse mapping. |
|
239 |
NOTICE: |
|
240 |
The value is searched using equality compare; |
|
241 |
use #keyAtValue:ifAbsent: to compare for identity." |
|
54 | 242 |
|
609 | 243 |
|idx| |
360 | 244 |
|
609 | 245 |
idx := valueArray indexOf:aValue. |
246 |
idx ~~ 0 ifTrue:[ |
|
247 |
^ keyArray at:idx |
|
248 |
]. |
|
54 | 249 |
|
609 | 250 |
"/ keyArray keysAndValuesDo:[:index :aKey | |
251 |
"/ (aKey notNil and:[aKey ~~ DeletedEntry]) ifTrue:[ |
|
252 |
"/ (valueArray at:index) = aValue ifTrue:[^ aKey]. |
|
253 |
"/ ]. |
|
254 |
"/ ]. |
|
54 | 255 |
|
609 | 256 |
^ exceptionBlock value |
54 | 257 |
! |
258 |
||
10 | 259 |
keyAtValue:aValue |
345 | 260 |
"return the key whose value is identical (i.e. using #== for compare) |
261 |
to the argument, nil if none found. |
|
77 | 262 |
This is a slow access, since there is no fast reverse mapping. |
357 | 263 |
NOTICE: |
362 | 264 |
The value is searched using identity compare; |
357 | 265 |
use #keyAtEqualValue: to compare for equality." |
10 | 266 |
|
267 |
^ self keyAtValue:aValue ifAbsent:[nil] |
|
268 |
! |
|
269 |
||
270 |
keyAtValue:aValue ifAbsent:exceptionBlock |
|
345 | 271 |
"return the key whose value is identical (i.e. using #== for compare) |
272 |
to the argument, if not found, return the value of exceptionBlock. |
|
357 | 273 |
This is a slow access, since there is no fast reverse mapping. |
274 |
NOTICE: |
|
362 | 275 |
The value is searched using identity compare; |
357 | 276 |
use #keyAtEqualValue:ifAbsent: to compare for equality." |
10 | 277 |
|
359 | 278 |
|idx| |
279 |
||
280 |
idx := valueArray identityIndexOf:aValue. |
|
281 |
idx ~~ 0 ifTrue:[ |
|
282 |
^ keyArray at:idx |
|
10 | 283 |
]. |
359 | 284 |
|
285 |
"/ keyArray keysAndValuesDo:[:index :aKey | |
|
360 | 286 |
"/ (aKey notNil and:[aKey ~~ DeletedEntry]) ifTrue:[ |
287 |
"/ (valueArray at:index) == aValue ifTrue:[^ aKey]. |
|
288 |
"/ ]. |
|
359 | 289 |
"/ ]. |
290 |
||
10 | 291 |
^ exceptionBlock value |
357 | 292 |
! |
293 |
||
609 | 294 |
keys |
295 |
"return a collection containing all keys of the receiver" |
|
296 |
||
297 |
|keySet| |
|
357 | 298 |
|
609 | 299 |
keySet := self emptyCollectionForKeys. |
300 |
keyArray do:[:key | |
|
301 |
(key notNil and:[key ~~ DeletedEntry]) ifTrue:[ |
|
302 |
keySet add:key |
|
303 |
] |
|
304 |
]. |
|
305 |
^ keySet |
|
357 | 306 |
! |
307 |
||
609 | 308 |
values |
309 |
"return a collection containing all values of the receiver" |
|
359 | 310 |
|
609 | 311 |
"old: |
312 |
kk: this fails if the receiver contains nils |
|
313 |
^ valueArray asBag |
|
314 |
new: |
|
315 |
" |
|
316 |
|aCollection| |
|
359 | 317 |
|
609 | 318 |
aCollection := OrderedCollection new:valueArray size. |
319 |
self do:[:value| aCollection add:value]. |
|
320 |
^ aCollection |
|
1 | 321 |
! ! |
322 |
||
323 |
!Dictionary methodsFor:'adding & removing'! |
|
324 |
||
325 |
add:anAssociation |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
326 |
"add the argument, anAssociation to the receiver. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
327 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
328 |
WARNING: do not add elements while iterating over the receiver. |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
329 |
Iterate over a copy to do this." |
1 | 330 |
|
331 |
self at:(anAssociation key) put:(anAssociation value). |
|
332 |
^ anAssociation |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
333 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
334 |
"Modified: 1.3.1996 / 21:23:53 / cg" |
1 | 335 |
! |
336 |
||
345 | 337 |
declare:key from:aDictionary |
338 |
"if the receiver does not include an association for key, |
|
339 |
take the association from aDictionary and add it to the receiver. |
|
340 |
If aDictionary does not contain such an association, use nil |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
341 |
as the value of the new dictionary. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
342 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
343 |
WARNING: do not add elements while iterating over the receiver. |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
344 |
Iterate over a copy to do this." |
345 | 345 |
|
346 |
|value| |
|
347 |
||
348 |
(self includesKey:key) ifFalse:[ |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
349 |
value := aDictionary at:key ifAbsent:nil. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
350 |
self at:key put:value. |
345 | 351 |
] |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
352 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
353 |
"Modified: 1.3.1996 / 21:24:03 / cg" |
345 | 354 |
! |
355 |
||
1 | 356 |
remove:oldObject ifAbsent:aBlock |
357 |
"remove oldObject from the collection and return it. |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
358 |
If it was not in the collection return the value of aBlock. |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
359 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
360 |
This is blocked here; you have to use one of |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
361 |
#removeKey:, #saveRemoveKey:, #removeAssociation:, |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
362 |
#removeValue: or #saveRemoveValue:" |
1 | 363 |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
364 |
^ self shouldNotImplement |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
365 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
366 |
"Modified: 1.3.1996 / 21:21:38 / cg" |
1 | 367 |
! |
368 |
||
369 |
removeAssociation:assoc |
|
370 |
"remove the association from the collection. |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
371 |
If it was not in the collection report an error. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
372 |
Only the key is used in the passed argument, and a new |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
373 |
association, for the key and the previously stored value is returned. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
374 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
375 |
WARNING: do not remove elements while iterating over the receiver. |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
376 |
See #saveRemoveKey: to do this." |
1 | 377 |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
378 |
|key| |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
379 |
|
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
380 |
key := assoc key. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
381 |
^ key -> (self removeKey:key) |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
382 |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
383 |
"Modified: 1.3.1996 / 21:21:11 / cg" |
1 | 384 |
! |
385 |
||
386 |
removeKey:aKey |
|
387 |
"remove the association under aKey from the collection. |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
388 |
If it was not in the collection report an error. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
389 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
390 |
WARNING: do not remove elements while iterating over the receiver. |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
391 |
See #saveRemoveKey: to do this." |
1 | 392 |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
393 |
^ self removeKey:aKey ifAbsent:[self errorKeyNotFound:aKey] |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
394 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
395 |
"Modified: 1.3.1996 / 21:21:52 / cg" |
1 | 396 |
! |
397 |
||
398 |
removeKey:aKey ifAbsent:aBlock |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
399 |
"remove the association under aKey from the collection, |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
400 |
return the value previously stored there.. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
401 |
If it was not in the collection return the result |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
402 |
from evaluating aBlock. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
403 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
404 |
WARNING: do not remove elements while iterating over the receiver. |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
405 |
See #saveRemoveKey: to do this." |
1 | 406 |
|
3 | 407 |
|index "{ Class:SmallInteger }" |
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
408 |
next "{ Class:SmallInteger }" |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
409 |
oldValue| |
1 | 410 |
|
411 |
aKey isNil ifTrue:[ |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
412 |
^ self errorInvalidKey:aKey |
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
413 |
]. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
414 |
|
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
415 |
"/ below, I could have written: |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
416 |
"/ index := self find:aKey ifAbsent:[^ aBlock value] |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
417 |
"/ but the code below is slighlty more efficient, since it avoids |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
418 |
"/ a garbage block creation - thus speeding up the good case. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
419 |
|
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
420 |
index := self find:aKey ifAbsent:0. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
421 |
index == 0 ifTrue:[^ aBlock value]. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
422 |
|
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
423 |
oldValue := valueArray basicAt:index. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
424 |
|
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
425 |
valueArray basicAt:index put:nil. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
426 |
keyArray basicAt:index put:nil. |
77 | 427 |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
428 |
tally := tally - 1. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
429 |
tally == 0 ifTrue:[ |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
430 |
self setTally:0 |
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
431 |
] ifFalse:[ |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
432 |
index == keyArray basicSize ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
433 |
next := 1 |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
434 |
] ifFalse:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
435 |
next := index + 1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
436 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
437 |
(keyArray basicAt:next) notNil ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
438 |
keyArray basicAt:index put:DeletedEntry |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
439 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
440 |
self emptyCheck |
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
441 |
]. |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
442 |
^ oldValue |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
443 |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
444 |
"Modified: 1.3.1996 / 21:21:01 / cg" |
77 | 445 |
! |
446 |
||
447 |
removeValue:aValue ifAbsent:aBlock |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
448 |
"remove (first) the association to aValue from the collection, |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
449 |
return the key under which it was stored previously. |
77 | 450 |
If it was not in the collection return result from evaluating aBlock. |
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
451 |
The value is searched using equality compare here, |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
452 |
but identity compare in the IdentityDictionary subclass. |
77 | 453 |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
454 |
Notice, this does a linear search through the values and may |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
455 |
therefore be slow for big dictionaries. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
456 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
457 |
WARNING: do not remove elements while iterating over the receiver. |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
458 |
See #saveRemoveValue: to do this." |
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
459 |
|
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
460 |
|next "{ Class:SmallInteger }" |
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
461 |
oldKey| |
77 | 462 |
|
463 |
aValue notNil ifTrue:[ |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
464 |
keyArray keysAndValuesDo:[:index :aKey | |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
465 |
|idx "{Class:SmallInteger}"| |
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
466 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
467 |
(aKey notNil and:[aKey ~~ DeletedEntry]) ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
468 |
idx := index. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
469 |
(self compareSame:(valueArray at:idx) with:aValue) ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
470 |
"found it" |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
471 |
valueArray basicAt:idx put:nil. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
472 |
oldKey := keyArray basicAt:idx. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
473 |
keyArray basicAt:idx put:nil. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
474 |
tally := tally - 1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
475 |
tally == 0 ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
476 |
self setTally:0. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
477 |
^ oldKey |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
478 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
479 |
idx == keyArray basicSize ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
480 |
next := 1 |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
481 |
] ifFalse:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
482 |
next := index + 1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
483 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
484 |
(keyArray basicAt:next) notNil ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
485 |
keyArray basicAt:idx put:DeletedEntry |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
486 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
487 |
self emptyCheck. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
488 |
^ oldKey |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
489 |
] |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
490 |
] |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
491 |
] |
77 | 492 |
]. |
493 |
^ aBlock value |
|
641
ef3bcf9de54b
return values in remove*** methods fixed (ST-80 compatibility)
Claus Gittinger <cg@exept.de>
parents:
633
diff
changeset
|
494 |
|
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
495 |
"Modified: 1.3.1996 / 21:22:11 / cg" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
496 |
! |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
497 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
498 |
saveRemoveKey:aKey |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
499 |
"remove the association under aKey from the collection. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
500 |
Return the value previously stored there. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
501 |
If it was not in the collection return nil. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
502 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
503 |
In contrast to #removeKey:, this does not resize the underlying collection |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
504 |
and therefore does NOT rehash & change the elements order. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
505 |
Therefor this can be used while enumerating the receiver, |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
506 |
which is not possible if #removeKey: is used. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
507 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
508 |
WARNING: since no resizing is done, the physical amount of memory used |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
509 |
by the container remains the same, although the logical size shrinks. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
510 |
You may want to manually resize the receiver using #emptyCheck." |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
511 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
512 |
|index "{ Class:SmallInteger }" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
513 |
next "{ Class:SmallInteger }" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
514 |
oldValue| |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
515 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
516 |
aKey isNil ifTrue:[^ nil]. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
517 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
518 |
index := self find:aKey ifAbsent:0. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
519 |
index == 0 ifTrue:[^ nil]. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
520 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
521 |
oldValue := valueArray basicAt:index. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
522 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
523 |
valueArray basicAt:index put:nil. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
524 |
keyArray basicAt:index put:nil. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
525 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
526 |
tally := tally - 1. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
527 |
tally ~~ 0 ifTrue:[ |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
528 |
index == keyArray basicSize ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
529 |
next := 1 |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
530 |
] ifFalse:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
531 |
next := index + 1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
532 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
533 |
(keyArray basicAt:next) notNil ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
534 |
keyArray basicAt:index put:DeletedEntry |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
535 |
]. |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
536 |
]. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
537 |
^ oldValue |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
538 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
539 |
"does NOT work: |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
540 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
541 |
|d| |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
542 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
543 |
d := Dictionary new. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
544 |
d at:'one' put:1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
545 |
d at:'two' put:2. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
546 |
d at:'three' put:3. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
547 |
d at:'four' put:4. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
548 |
d at:'five' put:5. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
549 |
d at:'six' put:6. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
550 |
d at:'seven' put:7. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
551 |
d at:'eight' put:8. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
552 |
d at:'nine' put:9. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
553 |
d keysAndValuesDo:[:k :v | |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
554 |
v odd ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
555 |
d removeKey:k |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
556 |
] |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
557 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
558 |
d inspect |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
559 |
" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
560 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
561 |
"DOES work: |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
562 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
563 |
|d| |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
564 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
565 |
d := Dictionary new. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
566 |
d at:'one' put:1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
567 |
d at:'two' put:2. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
568 |
d at:'three' put:3. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
569 |
d at:'four' put:4. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
570 |
d at:'five' put:5. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
571 |
d at:'six' put:6. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
572 |
d at:'seven' put:7. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
573 |
d at:'eight' put:8. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
574 |
d at:'nine' put:9. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
575 |
d keysAndValuesDo:[:k :v | |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
576 |
v odd ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
577 |
d saveRemoveKey:k |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
578 |
] |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
579 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
580 |
d inspect |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
581 |
" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
582 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
583 |
"Created: 1.3.1996 / 21:14:42 / cg" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
584 |
"Modified: 1.3.1996 / 21:14:53 / cg" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
585 |
! |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
586 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
587 |
saveRemoveValue:aValue |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
588 |
"remove the (first) association to aValue from the collection, |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
589 |
return the key under which it was stored previously. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
590 |
If it was not in the collection return nil. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
591 |
The value is searched using equality compare here, |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
592 |
but identity compare in the IdentityDictionary subclass. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
593 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
594 |
In contrast to #removeValue:, this does not resize the underlying collection |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
595 |
and therefore does NOT rehash & change the elements order. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
596 |
Therefor this can be used while enumerating the receiver, |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
597 |
which is not possible if #removeValue: is used. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
598 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
599 |
WARNING: since no resizing is done, the physical amount of memory used |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
600 |
by the container remains the same, although the logical size shrinks. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
601 |
You may want to manually resize the receiver using #emptyCheck." |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
602 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
603 |
|next "{ Class:SmallInteger }" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
604 |
oldKey| |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
605 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
606 |
aValue notNil ifTrue:[ |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
607 |
keyArray keysAndValuesDo:[:index :aKey | |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
608 |
|idx "{Class:SmallInteger}"| |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
609 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
610 |
(aKey notNil and:[aKey ~~ DeletedEntry]) ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
611 |
idx := index. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
612 |
(self compareSame:(valueArray at:idx) with:aValue) ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
613 |
"found it" |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
614 |
valueArray basicAt:idx put:nil. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
615 |
oldKey := keyArray basicAt:idx. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
616 |
keyArray basicAt:idx put:nil. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
617 |
tally := tally - 1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
618 |
tally ~~ 0 ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
619 |
idx == keyArray basicSize ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
620 |
next := 1 |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
621 |
] ifFalse:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
622 |
next := index + 1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
623 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
624 |
(keyArray basicAt:next) notNil ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
625 |
keyArray basicAt:idx put:DeletedEntry |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
626 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
627 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
628 |
^ oldKey |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
629 |
] |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
630 |
] |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
631 |
] |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
632 |
]. |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
633 |
^ aValue |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
634 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
635 |
"does NOT work: |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
636 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
637 |
|d| |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
638 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
639 |
d := Dictionary new. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
640 |
d at:'one' put:1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
641 |
d at:'two' put:2. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
642 |
d at:'three' put:3. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
643 |
d at:'four' put:4. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
644 |
d at:'five' put:5. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
645 |
d at:'six' put:6. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
646 |
d at:'seven' put:7. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
647 |
d at:'eight' put:8. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
648 |
d at:'nine' put:9. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
649 |
d keysAndValuesDo:[:k :v | |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
650 |
v odd ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
651 |
d removeValue:v ifAbsent:nil |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
652 |
] |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
653 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
654 |
d inspect |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
655 |
" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
656 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
657 |
"DOES work: |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
658 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
659 |
|d| |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
660 |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
661 |
d := Dictionary new. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
662 |
d at:'one' put:1. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
663 |
d at:'two' put:2. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
664 |
d at:'three' put:3. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
665 |
d at:'four' put:4. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
666 |
d at:'five' put:5. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
667 |
d at:'six' put:6. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
668 |
d at:'seven' put:7. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
669 |
d at:'eight' put:8. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
670 |
d at:'nine' put:9. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
671 |
d keysAndValuesDo:[:k :v | |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
672 |
v odd ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
673 |
d saveRemoveValue:v |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
674 |
] |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
675 |
]. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
676 |
d inspect |
1053
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
677 |
" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
678 |
|
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
679 |
"Created: 1.3.1996 / 21:17:10 / cg" |
ac1ea83233e6
added saveRemoveKey:/saveRemoveValue: & commentaries
Claus Gittinger <cg@exept.de>
parents:
641
diff
changeset
|
680 |
"Modified: 1.3.1996 / 21:23:04 / cg" |
1 | 681 |
! ! |
682 |
||
155 | 683 |
!Dictionary methodsFor:'copying'! |
684 |
||
685 |
postCopy |
|
686 |
"have to copy the valueArray too" |
|
687 |
||
688 |
super postCopy. |
|
689 |
valueArray := valueArray shallowCopy |
|
690 |
! ! |
|
691 |
||
217 | 692 |
!Dictionary methodsFor:'enumerating'! |
1 | 693 |
|
694 |
allKeysDo:aBlock |
|
302 | 695 |
"perform the block for all keys in the collection. |
696 |
Obsolete: use keysDo: for ST-80 compatibility." |
|
1 | 697 |
|
155 | 698 |
^ super do:aBlock |
1 | 699 |
! |
700 |
||
701 |
associationsDo:aBlock |
|
1056 | 702 |
"perform the block for all associations in the collection. |
703 |
||
704 |
WARNING: do not add/remove elements while iterating over the receiver. |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
705 |
Iterate over a copy to do this." |
1 | 706 |
|
38 | 707 |
|key n "{ Class: SmallInteger }"| |
1 | 708 |
|
709 |
tally == 0 ifTrue:[^ self]. |
|
38 | 710 |
n := keyArray basicSize. |
711 |
1 to:n do:[:index | |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
712 |
key := keyArray basicAt:index. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
713 |
(key notNil and:[key ~~ DeletedEntry]) ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
714 |
aBlock value:(Association key:key value:(valueArray basicAt:index)) |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
715 |
] |
1 | 716 |
] |
1056 | 717 |
|
718 |
"Modified: 1.3.1996 / 21:40:49 / cg" |
|
1 | 719 |
! |
720 |
||
609 | 721 |
collect:aBlock |
722 |
"for each element in the receiver, evaluate the argument, aBlock |
|
1056 | 723 |
and return a Bag with the results. |
724 |
||
725 |
WARNING: do not add/remove elements while iterating over the receiver. |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
726 |
Iterate over a copy to do this." |
609 | 727 |
|
728 |
|newCollection| |
|
729 |
||
730 |
newCollection := Bag new. |
|
731 |
self do:[:each | |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
732 |
newCollection add:(aBlock value:each) |
609 | 733 |
]. |
734 |
^ newCollection |
|
1056 | 735 |
|
736 |
"Modified: 1.3.1996 / 21:40:43 / cg" |
|
609 | 737 |
! |
738 |
||
1 | 739 |
do:aBlock |
1056 | 740 |
"perform the block for all values in the collection. |
741 |
||
742 |
WARNING: do not add/remove elements while iterating over the receiver. |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
743 |
Iterate over a copy to do this." |
1 | 744 |
|
38 | 745 |
|key n "{ Class: SmallInteger }"| |
1 | 746 |
|
747 |
tally == 0 ifTrue:[^ self]. |
|
38 | 748 |
n := keyArray basicSize. |
749 |
1 to:n do:[:index | |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
750 |
key := keyArray basicAt:index. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
751 |
(key notNil and:[key ~~ DeletedEntry]) ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
752 |
aBlock value:(valueArray basicAt:index) |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
753 |
]. |
1 | 754 |
] |
1056 | 755 |
|
756 |
"Modified: 1.3.1996 / 21:39:18 / cg" |
|
1 | 757 |
! |
758 |
||
3 | 759 |
keysAndValuesDo:aTwoArgBlock |
760 |
"evaluate the argument, aBlock for every element in the collection, |
|
1056 | 761 |
passing both key and element as arguments. |
762 |
||
763 |
WARNING: do not add/remove elements while iterating over the receiver. |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
764 |
Iterate over a copy to do this." |
3 | 765 |
|
38 | 766 |
|key n "{ Class: SmallInteger }"| |
3 | 767 |
|
768 |
tally == 0 ifTrue:[^ self]. |
|
38 | 769 |
n := keyArray basicSize. |
770 |
1 to:n do:[:index | |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
771 |
key := keyArray basicAt:index. |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
772 |
(key notNil and:[key ~~ DeletedEntry]) ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
773 |
aTwoArgBlock value:key value:(valueArray basicAt:index) |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
774 |
]. |
3 | 775 |
] |
1056 | 776 |
|
777 |
"Modified: 1.3.1996 / 21:39:49 / cg" |
|
3 | 778 |
! |
779 |
||
609 | 780 |
keysDo:aBlock |
1056 | 781 |
"perform the block for all keys in the collection. |
782 |
||
783 |
WARNING: do not add/remove elements while iterating over the receiver. |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
784 |
Iterate over a copy to do this." |
1 | 785 |
|
609 | 786 |
^ super do:aBlock |
1056 | 787 |
|
788 |
"Modified: 1.3.1996 / 21:39:41 / cg" |
|
1 | 789 |
! |
790 |
||
791 |
select:aBlock |
|
792 |
"return a new collection with all elements from the receiver, for which |
|
77 | 793 |
the argument aBlock evaluates to true. The block gets the individual values |
1056 | 794 |
as its single argument. |
795 |
||
796 |
WARNING: do not add/remove elements while iterating over the receiver. |
|
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
797 |
Iterate over a copy to do this." |
1 | 798 |
|
799 |
|newCollection| |
|
800 |
||
801 |
newCollection := self species new. |
|
77 | 802 |
self keysAndValuesDo:[:key :value | |
1126
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
803 |
(aBlock value:value) ifTrue:[ |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
804 |
newCollection at:key put:value |
497de696dff0
OOPS - could add elements twice after a remove (shame on me: how could that go unnoticed for so long ...)
Claus Gittinger <cg@exept.de>
parents:
1056
diff
changeset
|
805 |
] |
1 | 806 |
]. |
807 |
^ newCollection |
|
77 | 808 |
|
809 |
" |
|
810 |
|d| |
|
811 |
||
812 |
d := Dictionary new. |
|
813 |
d at:#foo put:#bar. |
|
814 |
d at:#bar put:#baz. |
|
815 |
d at:#baz put:#foo. |
|
816 |
||
817 |
d select:[:el | el startsWith:'b']. |
|
818 |
" |
|
1056 | 819 |
|
820 |
"Modified: 1.3.1996 / 21:40:17 / cg" |
|
1 | 821 |
! ! |
822 |
||
609 | 823 |
!Dictionary methodsFor:'inspecting'! |
824 |
||
825 |
inspectorClass |
|
826 |
"redefined to use DictionaryInspector |
|
827 |
(instead of the default Inspector)." |
|
828 |
||
829 |
^ DictionaryInspectorView |
|
830 |
! ! |
|
831 |
||
832 |
!Dictionary methodsFor:'printing & storing'! |
|
833 |
||
834 |
displayString |
|
835 |
"return a string for displaying" |
|
836 |
||
837 |
^ self stringWith:#displayString |
|
838 |
! |
|
839 |
||
840 |
printString |
|
841 |
"return a string for printing" |
|
842 |
||
843 |
^ self stringWith:#printString |
|
844 |
! |
|
845 |
||
846 |
storeOn:aStream |
|
847 |
"output a printed representation (which can be re-read) |
|
848 |
onto the argument aStream" |
|
849 |
||
850 |
|isEmpty| |
|
851 |
||
852 |
thisContext isRecursive ifTrue:[ |
|
853 |
Transcript showCr:'Error: storeOn: of self referencing collection.'. |
|
854 |
aStream nextPutAll:'#recursive'. |
|
855 |
^ self |
|
856 |
]. |
|
857 |
||
858 |
aStream nextPutAll:'('. |
|
859 |
aStream nextPutAll:(self class name). |
|
860 |
aStream nextPutAll:' new'. |
|
861 |
isEmpty := true. |
|
862 |
self keysAndValuesDo:[:key :value | |
|
863 |
aStream nextPutAll:' at:'. |
|
864 |
key storeOn:aStream. |
|
865 |
aStream nextPutAll:' put:'. |
|
866 |
value storeOn:aStream. |
|
867 |
aStream nextPutAll:'; '. |
|
868 |
isEmpty := false |
|
869 |
]. |
|
870 |
isEmpty ifFalse:[aStream nextPutAll:' yourself']. |
|
871 |
aStream nextPut:$) |
|
872 |
||
873 |
" |
|
874 |
Dictionary new storeOn:Transcript |
|
875 |
||
876 |
(Dictionary new at:1 put:'hello'; yourself) storeOn:Transcript |
|
877 |
" |
|
878 |
||
879 |
" |
|
880 |
|d| |
|
881 |
d := Dictionary new. |
|
882 |
d at:1 put:'hello'. |
|
883 |
d at:'hello' put:#world. |
|
884 |
d storeOn:Transcript |
|
885 |
" |
|
886 |
||
887 |
" |
|
888 |
|d| |
|
889 |
d := Dictionary new. |
|
890 |
d at:1 put:'hello'. |
|
891 |
d at:'hello' put:#world. |
|
892 |
d at:2 put:d. |
|
893 |
d storeOn:Transcript |
|
894 |
" |
|
895 |
! |
|
896 |
||
897 |
stringWith:aSelector |
|
898 |
"common code for printString & displayString" |
|
899 |
||
900 |
|thisString string noneYet| |
|
901 |
||
902 |
string := (self class name) , '('. |
|
903 |
noneYet := true. |
|
904 |
self associationsDo:[:element | |
|
905 |
thisString := element perform:aSelector. |
|
906 |
noneYet ifTrue:[noneYet := false] |
|
907 |
ifFalse:[thisString := ' ' , thisString]. |
|
908 |
string := string , thisString |
|
909 |
]. |
|
910 |
string := string , ')'. |
|
911 |
^string |
|
912 |
! ! |
|
913 |
||
1 | 914 |
!Dictionary methodsFor:'private'! |
915 |
||
345 | 916 |
compareSame:element1 with:element2 |
917 |
^ element1 = element2 |
|
918 |
! |
|
919 |
||
609 | 920 |
emptyCollectionForKeys |
921 |
^ Set new:(self size) |
|
1 | 922 |
! |
923 |
||
924 |
grow:newSize |
|
925 |
"grow the receiver to make space for at least newSize elements. |
|
926 |
To do this, we have to rehash into the new arrays. |
|
927 |
(which is done by re-adding all elements to a new, empty key/value array pair)." |
|
928 |
||
92 | 929 |
|key deletedEntry oldKeyArray oldValueArray n |
930 |
oldSize "{ Class:SmallInteger }" |
|
10 | 931 |
newIndex "{ Class:SmallInteger }" | |
1 | 932 |
|
10 | 933 |
oldKeyArray := keyArray. |
934 |
oldValueArray := valueArray. |
|
1 | 935 |
|
249 | 936 |
n := self class goodSizeFrom:newSize. |
937 |
oldSize := oldKeyArray size. |
|
938 |
n == oldSize ifTrue:[^ self]. |
|
939 |
||
10 | 940 |
keyArray := self keyContainerOfSize:n. |
92 | 941 |
valueArray := self valueContainerOfSize:n. |
1 | 942 |
|
249 | 943 |
|
92 | 944 |
deletedEntry := DeletedEntry. |
10 | 945 |
1 to:oldSize do:[:index | |
155 | 946 |
key := oldKeyArray basicAt:index. |
947 |
(key notNil and:[key ~~ deletedEntry]) ifTrue:[ |
|
948 |
newIndex := self findNil:key. |
|
949 |
keyArray basicAt:newIndex put:key. |
|
950 |
valueArray basicAt:newIndex put:(oldValueArray basicAt:index). |
|
951 |
] |
|
1 | 952 |
] |
953 |
! |
|
954 |
||
955 |
rehash |
|
956 |
"rehash contents - is done by re-adding all elements to a new, empty key/value array pair)." |
|
957 |
||
2 | 958 |
| oldKeyArray oldValueArray key |
959 |
n "{ Class:SmallInteger }" |
|
960 |
newIndex "{ Class:SmallInteger }" | |
|
1 | 961 |
|
962 |
oldKeyArray := keyArray. |
|
963 |
oldValueArray := valueArray. |
|
964 |
||
965 |
n := keyArray size. |
|
10 | 966 |
keyArray := self keyContainerOfSize:n. |
92 | 967 |
valueArray := self valueContainerOfSize:n. |
1 | 968 |
|
2 | 969 |
1 to:n do:[:index | |
155 | 970 |
key := oldKeyArray basicAt:index. |
971 |
(key notNil and:[key ~~ DeletedEntry]) ifTrue:[ |
|
972 |
newIndex := self findNil:key. |
|
973 |
keyArray basicAt:newIndex put:key. |
|
974 |
valueArray basicAt:newIndex put:(oldValueArray basicAt:index). |
|
975 |
] |
|
1 | 976 |
] |
977 |
! |
|
978 |
||
979 |
rehashFrom:startIndex |
|
77 | 980 |
"rehash elements starting at index - after a remove. |
981 |
NOTE: this method is no longer needed; |
|
155 | 982 |
the trick using DeletedEntry avoids the need to do this time |
983 |
consuming operation, making remove pretty fast :-) |
|
77 | 984 |
" |
1 | 985 |
|
986 |
|key i length |
|
987 |
index "{ Class:SmallInteger }" | |
|
988 |
||
989 |
length := keyArray basicSize. |
|
990 |
index := startIndex. |
|
991 |
key := keyArray basicAt:index. |
|
992 |
[key notNil] whileTrue:[ |
|
155 | 993 |
key ~~ DeletedEntry ifTrue:[ |
994 |
i := self findNil:key. |
|
995 |
i == index ifTrue:[ |
|
996 |
^ self |
|
997 |
]. |
|
998 |
keyArray basicAt:i put:key. |
|
999 |
valueArray basicAt:i put:(valueArray basicAt:index). |
|
1000 |
keyArray basicAt:index put:nil. |
|
1001 |
valueArray basicAt:index put:nil. |
|
1002 |
]. |
|
1003 |
index == length ifTrue:[ |
|
1004 |
index := 1 |
|
1005 |
] ifFalse:[ |
|
1006 |
index := index + 1. |
|
1007 |
]. |
|
1008 |
key := keyArray basicAt:index. |
|
1 | 1009 |
] |
77 | 1010 |
! |
1011 |
||
609 | 1012 |
setTally:count |
1013 |
"initialize the contents array (for at least count slots) |
|
1014 |
and set tally to zero. |
|
1015 |
The size is increased to the next prime for better hashing behavior." |
|
1 | 1016 |
|
609 | 1017 |
|n| |
1 | 1018 |
|
609 | 1019 |
n := self class goodSizeFrom:count. |
1020 |
keyArray := self keyContainerOfSize:n. |
|
1021 |
valueArray := self valueContainerOfSize:n. |
|
1022 |
tally := 0 |
|
44 | 1023 |
! |
1024 |
||
609 | 1025 |
valueContainerOfSize:n |
1026 |
"return a container for values of size n. |
|
1027 |
Extracted to make life of weak subclasses easier ..." |
|
44 | 1028 |
|
609 | 1029 |
^ Array basicNew:n |
1030 |
! ! |
|
1031 |
||
1032 |
!Dictionary methodsFor:'testing'! |
|
44 | 1033 |
|
609 | 1034 |
includes:anObject |
1035 |
"/ OLD: |
|
1036 |
"/ "return true, if there is an association in the receiver with the |
|
1037 |
"/ same key as the argument, anObject. |
|
1038 |
"/ NOTICE: in contrast to #includesAssociation:, this compares only the key." |
|
1039 |
"/ |
|
1040 |
"/ ^ self includesKey:(anObject key) |
|
1041 |
||
1042 |
"/ NEW: |
|
1043 |
"return true, if the argument, aValue is stored in the dictionary, |
|
1044 |
i.e. if there is an associaten, with aValue as value. |
|
1045 |
This is a slow search, since there is no fast reverse mapping; |
|
1046 |
the values have to be all scanned without any hashing. |
|
1047 |
You need a special collection (or two Dictionaries) to get this |
|
1048 |
reverse mapping fast." |
|
1049 |
||
1050 |
^ self includesValue:anObject |
|
1051 |
! |
|
68 | 1052 |
|
609 | 1053 |
includesAssociation:anAssociation |
1054 |
"return true, if there is an association in the receiver with the |
|
1055 |
same key and value as the argument, anAssociation. |
|
1056 |
NOTICE: in contrast to #includes:, this compares both key and value." |
|
1057 |
||
1058 |
|val| |
|
44 | 1059 |
|
609 | 1060 |
val := self at:(anAssociation key) ifAbsent:[^ false]. |
1061 |
^ (self compareSame:val with:anAssociation) value |
|
1062 |
! |
|
1063 |
||
1064 |
includesKey:aKey |
|
1065 |
"return true, if the argument, aKey is a key in the receiver" |
|
1066 |
||
1067 |
^ (self find:aKey ifAbsent:0) ~~ 0 |
|
1068 |
! |
|
293 | 1069 |
|
609 | 1070 |
includesValue:aValue |
1071 |
"return true, if the argument, aValue is stored in the dictionary, |
|
1072 |
i.e. if there is an associaten, with aValue as value. |
|
1073 |
This is a slow search, since there is no fast reverse mapping; |
|
1074 |
the values have to be all scanned without any hashing. |
|
1075 |
You need a special collection (or two Dictionaries) to get this |
|
1076 |
reverse mapping fast." |
|
293 | 1077 |
|
609 | 1078 |
^ valueArray includes:aValue |
1079 |
! |
|
293 | 1080 |
|
609 | 1081 |
occurrencesOf:anObject |
1082 |
"count & return how often anObject is stored in the dictionary. |
|
1083 |
This counts values - not keys." |
|
1084 |
||
1085 |
^ valueArray occurrencesOf:anObject |
|
1 | 1086 |
! ! |
609 | 1087 |
|
633 | 1088 |
!Dictionary class methodsFor:'documentation'! |
1089 |
||
1090 |
version |
|
1221 | 1091 |
^ '$Header: /cvs/stx/stx/libbasic/Attic/Dict.st,v 1.36 1996-04-19 10:46:37 cg Exp $' |
633 | 1092 |
! ! |