#OTHER by mawalch
occure -> occur
occurence -> occurrence
occures -> occurs
occured -> occurred
--- a/SemaphoreSet.st Mon Aug 15 12:50:38 2016 +0200
+++ b/SemaphoreSet.st Mon Aug 15 12:50:40 2016 +0200
@@ -237,10 +237,10 @@
"wait for any of the semaphore, but abort the wait after some time.
Return the (first) triggered semaphore if any, nil if we return due to a timeout."
- |currentProcess gotSema wasBlocked timeoutBlock timeoutOccured mustUnregisterAllSemas|
+ |currentProcess gotSema wasBlocked timeoutBlock timeoutOccurred mustUnregisterAllSemas|
currentProcess := Processor activeProcess.
- timeoutOccured := false.
+ timeoutOccurred := false.
wasBlocked := OperatingSystem blockInterrupts.
[
@@ -250,7 +250,7 @@
gotSema isNil ifTrue:[
mustUnregisterAllSemas := true.
- (milliSeconds notNil and:[timeoutBlock isNil]) ifTrue:[
+ (milliSeconds notNil and:[timeoutBlock isNil]) ifTrue:[
|now endTime|
milliSeconds == 0 ifTrue:[
@@ -266,8 +266,8 @@
endTime := OperatingSystem millisecondTimeAdd:now and:milliSeconds.
timeoutBlock := [
- timeoutOccured := true.
- timeoutBlock := nil.
+ timeoutOccurred := true.
+ timeoutBlock := nil.
Processor resume:currentProcess.
].
Processor addTimedBlock:timeoutBlock for:currentProcess atMilliseconds:endTime.
@@ -288,7 +288,7 @@
].
].
- gotSema isNil and:[timeoutOccured not]
+ gotSema isNil and:[timeoutOccurred not]
] whileTrue.
timeoutBlock notNil ifTrue:[