hg/stx-libbasic: comparison PositionableStream.st

equal deleted inserted replaced

-:30374121d853
+:e1aad938d629
 ErrorDuringFileInSignal isNil ifTrue:[
 ErrorDuringFileInSignal := ErrorSignal newSignalMayProceed:true.
 ErrorDuringFileInSignal nameClass:self message:#errorDuringFileInSignal.
 ErrorDuringFileInSignal notifierString:'error during fileIn'.
-InvalidPositionErrorSignal := PositionErrorSignal newSignalMayProceed:true.
+"/        InvalidPositionErrorSignal := PositionErrorSignal newSignalMayProceed:true.
-InvalidPositionErrorSignal nameClass:self message:#invalidPositionErrorSignal.
+"/        InvalidPositionErrorSignal nameClass:self message:#invalidPositionErrorSignal.
-InvalidPositionErrorSignal notifierString:'invalid position'.
+InvalidPositionErrorSignal := PositionOutOfBoundsError.
+InvalidPositionErrorSignal notifierString:'position out of bounds: '.
 CurrentFileInDirectoryQuerySignal := QuerySignal new.
 CurrentFileInDirectoryQuerySignal nameClass:self message:#currentFileInDirectoryQuerySignal.
 CurrentFileInDirectoryQuerySignal notifierString:'query for current directory when filing in'.
 CurrentFileInDirectoryQuerySignal handlerBlock:[:ex | ex proceedWith:Filename currentDirectory].
 ZeroPosition := 1.
 ]
 ! !
 !PositionableStream class methodsFor:'instance creation'!
 on:aCollection
 "set the read (or write) position"
 "/ FIX: allow positioning right after last element of stream
 "/ ((index > readLimit) or:[index < 0]) ifTrue: [^ self positionError].
-((index > (readLimit+1)) or:[index < ZeroPosition]) ifTrue: [^ self positionError].
+((index > (readLimit+1)) or:[index < ZeroPosition]) ifTrue: [^ self positionError:index].
 position := index
 "
 |s|
 ^ InvalidPositionErrorSignal raiseRequestWith:nil
 "Modified: / 26.7.1999 / 10:59:13 / stefan"
 !
+positionError:badPostition
+"{ Pragma: +optSpace }"
+"report an error when positioning past the end
+or before the beginning."
+^ InvalidPositionErrorSignal raiseRequestWith:badPostition
+!
 with:aCollection
 "setup for streaming to the end of aCollection"
 collection := aCollection.
 readLimit := aCollection size + 1.
 ! !
 !PositionableStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.105 2001-11-21 15:04:10 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.106 2001-12-13 19:00:33 cg Exp $'
 ! !
 PositionableStream initialize!

changeset 6314	e1aad938d629
parent 6230	877a8da90c7c
child 6361	93376085b2df