Fix spelling.
--- a/WeakIdDict.st Tue Sep 30 11:36:17 1997 +0200
+++ b/WeakIdDict.st Wed Oct 01 13:40:14 1997 +0200
@@ -218,12 +218,12 @@
findKeyOrNil:key
"Look for the key in the receiver.
- If it is found, return return the index,
+ If it is found, return the index,
otherwise the index of the first unused slot.
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."
+ by at:put: / add: - like methods."
|index "{ Class:SmallInteger }"
length "{ Class:SmallInteger }"
@@ -231,12 +231,12 @@
delIndex "{ Class:SmallInteger }"|
(OperatingSystem blockInterrupts) ifFalse:[
- "/
- "/ may never be entered with interrupts enabled
- "/
- OperatingSystem unblockInterrupts.
- self error:'oops - unblocked call of findKeyOrNil'.
- ^ nil "/ leads to another error, if proceeded
+ "/
+ "/ may never be entered with interrupts enabled
+ "/
+ OperatingSystem unblockInterrupts.
+ self error:'oops - unblocked call of findKeyOrNil'.
+ ^ nil "/ leads to another error, if proceeded
].
delIndex := 0.
@@ -244,48 +244,49 @@
length := keyArray basicSize.
index := key identityHash.
index < 16r1FFFFFFF ifTrue:[
- index := index * 2
+ index := index * 2
].
index := index \\ length + 1.
startIndex := index.
[true] whileTrue:[
- probe := keyArray basicAt:index.
- key == probe ifTrue:[^ index].
- probe isNil ifTrue:[
- delIndex == 0 ifTrue:[^ index].
- keyArray basicAt:delIndex put:nil.
- ^ delIndex
- ].
+ probe := keyArray basicAt:index.
+ key == probe ifTrue:[^ index].
+ probe isNil ifTrue:[
+ delIndex == 0 ifTrue:[^ index].
+ keyArray basicAt:delIndex put:nil.
+ ^ delIndex
+ ].
- probe == 0 ifTrue:[
- probe := DeletedEntry.
- keyArray basicAt:index put:probe.
- valueArray basicAt:index put:nil.
- tally := tally - 1.
- ].
+ probe == 0 ifTrue:[
+ probe := DeletedEntry.
+ keyArray basicAt:index put:probe.
+ valueArray basicAt:index put:nil.
+ tally := tally - 1.
+ ].
- delIndex == 0 ifTrue:[
- probe == DeletedEntry ifTrue:[
- delIndex := index
- ]
- ].
+ delIndex == 0 ifTrue:[
+ probe == DeletedEntry ifTrue:[
+ delIndex := index
+ ]
+ ].
- index == length ifTrue:[
- index := 1
- ] ifFalse:[
- index := index + 1
- ].
- index == startIndex ifTrue:[
- delIndex ~~ 0 ifTrue:[
- keyArray basicAt:delIndex put:nil.
- ^ delIndex
- ].
- ^ self grow findKeyOrNil:key
- ].
+ index == length ifTrue:[
+ index := 1
+ ] ifFalse:[
+ index := index + 1
+ ].
+ index == startIndex ifTrue:[
+ delIndex ~~ 0 ifTrue:[
+ keyArray basicAt:delIndex put:nil.
+ ^ delIndex
+ ].
+ ^ self grow findKeyOrNil:key
+ ].
]
"Modified: 30.1.1997 / 15:04:34 / cg"
+ "Modified: 1.10.1997 / 11:25:32 / stefan"
!
grow:newSize
@@ -419,5 +420,5 @@
!WeakIdentityDictionary class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/Attic/WeakIdDict.st,v 1.32 1997-09-09 17:31:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/Attic/WeakIdDict.st,v 1.33 1997-10-01 11:40:14 stefan Exp $'
! !
--- a/WeakIdentityDictionary.st Tue Sep 30 11:36:17 1997 +0200
+++ b/WeakIdentityDictionary.st Wed Oct 01 13:40:14 1997 +0200
@@ -218,12 +218,12 @@
findKeyOrNil:key
"Look for the key in the receiver.
- If it is found, return return the index,
+ If it is found, return the index,
otherwise the index of the first unused slot.
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."
+ by at:put: / add: - like methods."
|index "{ Class:SmallInteger }"
length "{ Class:SmallInteger }"
@@ -231,12 +231,12 @@
delIndex "{ Class:SmallInteger }"|
(OperatingSystem blockInterrupts) ifFalse:[
- "/
- "/ may never be entered with interrupts enabled
- "/
- OperatingSystem unblockInterrupts.
- self error:'oops - unblocked call of findKeyOrNil'.
- ^ nil "/ leads to another error, if proceeded
+ "/
+ "/ may never be entered with interrupts enabled
+ "/
+ OperatingSystem unblockInterrupts.
+ self error:'oops - unblocked call of findKeyOrNil'.
+ ^ nil "/ leads to another error, if proceeded
].
delIndex := 0.
@@ -244,48 +244,49 @@
length := keyArray basicSize.
index := key identityHash.
index < 16r1FFFFFFF ifTrue:[
- index := index * 2
+ index := index * 2
].
index := index \\ length + 1.
startIndex := index.
[true] whileTrue:[
- probe := keyArray basicAt:index.
- key == probe ifTrue:[^ index].
- probe isNil ifTrue:[
- delIndex == 0 ifTrue:[^ index].
- keyArray basicAt:delIndex put:nil.
- ^ delIndex
- ].
+ probe := keyArray basicAt:index.
+ key == probe ifTrue:[^ index].
+ probe isNil ifTrue:[
+ delIndex == 0 ifTrue:[^ index].
+ keyArray basicAt:delIndex put:nil.
+ ^ delIndex
+ ].
- probe == 0 ifTrue:[
- probe := DeletedEntry.
- keyArray basicAt:index put:probe.
- valueArray basicAt:index put:nil.
- tally := tally - 1.
- ].
+ probe == 0 ifTrue:[
+ probe := DeletedEntry.
+ keyArray basicAt:index put:probe.
+ valueArray basicAt:index put:nil.
+ tally := tally - 1.
+ ].
- delIndex == 0 ifTrue:[
- probe == DeletedEntry ifTrue:[
- delIndex := index
- ]
- ].
+ delIndex == 0 ifTrue:[
+ probe == DeletedEntry ifTrue:[
+ delIndex := index
+ ]
+ ].
- index == length ifTrue:[
- index := 1
- ] ifFalse:[
- index := index + 1
- ].
- index == startIndex ifTrue:[
- delIndex ~~ 0 ifTrue:[
- keyArray basicAt:delIndex put:nil.
- ^ delIndex
- ].
- ^ self grow findKeyOrNil:key
- ].
+ index == length ifTrue:[
+ index := 1
+ ] ifFalse:[
+ index := index + 1
+ ].
+ index == startIndex ifTrue:[
+ delIndex ~~ 0 ifTrue:[
+ keyArray basicAt:delIndex put:nil.
+ ^ delIndex
+ ].
+ ^ self grow findKeyOrNil:key
+ ].
]
"Modified: 30.1.1997 / 15:04:34 / cg"
+ "Modified: 1.10.1997 / 11:25:32 / stefan"
!
grow:newSize
@@ -419,5 +420,5 @@
!WeakIdentityDictionary class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/WeakIdentityDictionary.st,v 1.32 1997-09-09 17:31:56 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/WeakIdentityDictionary.st,v 1.33 1997-10-01 11:40:14 stefan Exp $'
! !