hg/stx-libbasic: comparison Set.st

equal deleted inserted replaced

-:1c9224a6ec00
+:d35a89d5c0ec
 "Modified: 1.3.1996 / 21:41:13 / cg"
 ! !
 !Set methodsFor:'obsolete set operations'!
 + aCollection
 "Kept for backward compatibility.
 Use #union: instead, to isolate arithmethic and set operations"
 "/  ].
 startIndex := index := self initialIndexForKey:key.
 [
-probe := (keyArray basicAt:index).
+probe := keyArray basicAt:index.
-(probe notNil and:[probe ~~ DeletedEntry and:[key = probe]]) ifTrue:[^ index].
+probe isNil ifTrue:[^ aBlock value].
-(self slotIsEmpty:probe) ifTrue:[^ aBlock value].
+(probe ~~ DeletedEntry and:[key = probe]) ifTrue:[^ index].
 index == length ifTrue:[
 index := 1
 ] ifFalse:[
 index := index + 1
 !
 findKeyOrNil:key
 "Look for the key in the receiver.
 If it is found, return the index of the first unused slot.
-Grow the receiver, if key was not found, and no unused slots were present"
+Grow the receiver, if key was not found, and no unused slots were present
+Warning: an empty slot MUST be filled by the sender - it is only to be sent
+by at:put: / add: - like methods."
 |index  "{ Class:SmallInteger }"
 length "{ Class:SmallInteger }"
 startIndex probe
-delIndex|
+delIndex "{ Class:SmallInteger }"|
+delIndex := 0.
 length := keyArray basicSize.
 startIndex := index := self initialIndexForKey:key.
 [
 probe := keyArray basicAt:index.
-(probe notNil and:[probe ~~ DeletedEntry and:[key = probe]]) ifTrue:[^ index].
+probe isNil ifTrue:[
-(self slotIsEmpty:probe) ifTrue:[
+delIndex == 0 ifTrue:[^ index].
-delIndex isNil ifTrue:[^ index].
 keyArray basicAt:delIndex put:nil.
 ^ delIndex
 ].
 probe == DeletedEntry ifTrue:[
-delIndex isNil ifTrue:[
+delIndex == 0 ifTrue:[
 delIndex := index
 ]
+] ifFalse:[
+key = probe ifTrue:[^ index]
 ].
 index == length ifTrue:[
 index := 1
 ] ifFalse:[
 index := index + 1
 ].
 index == startIndex ifTrue:[
-delIndex notNil ifTrue:[
+delIndex ~~ 0 ifTrue:[
 keyArray basicAt:delIndex put:nil.
 ^ delIndex
 ].
 ^ self grow findKeyOrNil:key
 ].
 	] ifFalse:[
 	    index := index + 1.
 	].
 	element := keyArray basicAt:index.
 ]
-!
-slotIsEmpty:aSlotValue
-"only redefined in weak subclasses, since they treat a 0-value
-as being empty"
-^ aSlotValue isNil
 ! !
 !Set methodsFor:'private-grow & shrink'!
 grow
 count := 0.
 [
 probe := keyArray basicAt:index.
 (probe notNil and:[key = probe]) ifTrue:[^ count].
-(self slotIsEmpty:probe) ifTrue:[self error:'non existing key'].
+probe isNil ifTrue:[self error:'non existing key'].
 index == length ifTrue:[
 index := 1.
 ] ifFalse:[
 index := index + 1.
 "return the number of set elements"
 ^ tally
 ! !
 !Set methodsFor:'searching'!
 findFirst:aBlock ifNone:exceptionValue
 "find the index of the first element, for which evaluation of the argument, aBlock returns true;
 return its index or the value from exceptionValue if none detected.

branch	jv
changeset 19559	d35a89d5c0ec
parent 19103	71257a47eba2
parent 19542	0cff447dfffa
child 19882	8a3f4071dfec