hg/stx-libbasic: comparison PosStream.st

equal deleted inserted replaced

-:be947d4e7fb2
+:514c749165c3
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 category:'Streams'
 !
 PositionableStream comment:'
 COPYRIGHT (c) 1989 by Claus Gittinger
-All Rights Reserved
+	      All Rights Reserved
-$Header: /cvs/stx/stx/libbasic/Attic/PosStream.st,v 1.15 1994-08-05 00:59:23 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/PosStream.st,v 1.16 1994-10-10 00:27:25 claus Exp $
 '!
 !PositionableStream class methodsFor:'documentation'!
 copyright
 "
 COPYRIGHT (c) 1989 by Claus Gittinger
-All Rights Reserved
+	      All Rights Reserved
 This software is furnished under a license and may be used
 only in accordance with the terms of that license and with the
 inclusion of the above copyright notice.   This software may not
 be provided or otherwise made available to, or used by, any
 "
 !
 version
 "
-$Header: /cvs/stx/stx/libbasic/Attic/PosStream.st,v 1.15 1994-08-05 00:59:23 claus Exp $
+$Header: /cvs/stx/stx/libbasic/Attic/PosStream.st,v 1.16 1994-10-10 00:27:25 claus Exp $
 "
 !
 documentation
 "
 initialize
 "setup the signal used to handle errors during fileIn"
 ErrorDuringFileInSignal isNil ifTrue:[
-ErrorDuringFileInSignal := (Signal new) mayProceed:true.
+	Object initialize.
-ErrorDuringFileInSignal notifierString:'error during fileIn'.
+	ErrorDuringFileInSignal := Object errorSignal newSignalMayProceed:true.
+	ErrorDuringFileInSignal nameClass:self message:#errorDuringFileInSignal.
+	ErrorDuringFileInSignal notifierString:'error during fileIn'.
 ]
 ! !
 !PositionableStream class methodsFor:'constants'!
 peekFor:something
 "return true and move past if next == something;
 otherwise stay and let position unchanged"
 self next == something ifTrue:[
-^ true
+	^ true
 ].
 self backStep.
 ^ false
 !
 index := 0.
 done := false.
 inPrimitive := false.
 [done] whileFalse:[
-((index + 2) <= currSize) ifFalse:[
+	((index + 2) <= currSize) ifFalse:[
-newString := String new:(currSize * 2).
+	    newString := String new:(currSize * 2).
-newString replaceFrom:1 to:currSize with:theString.
+	    newString replaceFrom:1 to:currSize with:theString.
-currSize := currSize * 2.
+	    currSize := currSize * 2.
-theString := newString
+	    theString := newString
-].
+	].
-thisChar isNil ifTrue:[
+	thisChar isNil ifTrue:[
-done := true
+	    done := true
-] ifFalse:[
+	] ifFalse:[
-(thisChar == $% ) ifTrue:[
+	    (thisChar == $% ) ifTrue:[
-nextChar := self peek.
+		nextChar := self peek.
-(nextChar == ${ ) ifTrue:[
+		(nextChar == ${ ) ifTrue:[
-inPrimitive := true.
+		    inPrimitive := true.
-index := index + 1.
+		    index := index + 1.
-theString at:index put:thisChar.
+		    theString at:index put:thisChar.
-thisChar := self next
+		    thisChar := self next
-] ifFalse:[
+		] ifFalse:[
-(nextChar == $} ) ifTrue:[
+		    (nextChar == $} ) ifTrue:[
-inPrimitive := false.
+			inPrimitive := false.
-index := index + 1.
+			index := index + 1.
-theString at:index put:thisChar.
+			theString at:index put:thisChar.
-thisChar := self next
+			thisChar := self next
-]
+		    ]
-]
+		]
-] ifFalse:[
+	    ] ifFalse:[
-inPrimitive ifFalse:[
+		inPrimitive ifFalse:[
-(thisChar == sep) ifTrue:[
+		    (thisChar == sep) ifTrue:[
-(self peek == sep) ifFalse:[
+			(self peek == sep) ifFalse:[
-done := true
+			    done := true
-] ifTrue:[
+			] ifTrue:[
-self next
+			    self next
-]
+			]
-]
+		    ]
-]
+		]
-]
+	    ]
-].
+	].
-done ifFalse:[
+	done ifFalse:[
-index := index + 1.
+	    index := index + 1.
-theString at:index put:thisChar.
+	    theString at:index put:thisChar.
-thisChar := self next
+	    thisChar := self next
-]
+	]
 ].
 (index == 0) ifTrue:[^ ''].
 ^ theString copyTo:index
 !
 gotPercent := false.
 index := 1.
 endIndex := aString size.
 [index <= endIndex] whileTrue:[
-next := aString indexOf:$% startingAt:index ifAbsent:[endIndex + 1].
+	next := aString indexOf:$% startingAt:index ifAbsent:[endIndex + 1].
-next := next min:
+	next := next min:
-(aString indexOf:${ startingAt:index ifAbsent:[endIndex + 1]).
+		(aString indexOf:${ startingAt:index ifAbsent:[endIndex + 1]).
-next := next min:
+	next := next min:
-(aString indexOf:$} startingAt:index ifAbsent:[endIndex + 1]).
+		(aString indexOf:$} startingAt:index ifAbsent:[endIndex + 1]).
-next := next min:
+	next := next min:
-(aString indexOf:sep startingAt:index ifAbsent:[endIndex + 1]).
+		(aString indexOf:sep startingAt:index ifAbsent:[endIndex + 1]).
-((index == 1) and:[next == (endIndex + 1)]) ifTrue:[
+	((index == 1) and:[next == (endIndex + 1)]) ifTrue:[
-self nextPutAll:aString
+	    self nextPutAll:aString
-] ifFalse:[
+	] ifFalse:[
-self nextPutAll:(aString copyFrom:index to:(next - 1))
+	    self nextPutAll:(aString copyFrom:index to:(next - 1))
-].
+	].
-index := next.
+	index := next.
-(index <= endIndex) ifTrue:[
+	(index <= endIndex) ifTrue:[
-character := aString at:index.
+	    character := aString at:index.
-(character == $% ) ifTrue:[
+	    (character == $% ) ifTrue:[
-gotPercent := true
+		gotPercent := true
-] ifFalse:[
+	    ] ifFalse:[
-(character == ${ ) ifTrue:[
+		(character == ${ ) ifTrue:[
-gotPercent ifTrue:[
+		    gotPercent ifTrue:[
-inPrimitive := true
+			inPrimitive := true
-]
+		    ]
-] ifFalse:[
+		] ifFalse:[
-(character == $} ) ifTrue:[
+		    (character == $} ) ifTrue:[
-gotPercent ifTrue:[
+			gotPercent ifTrue:[
-inPrimitive := false
+			    inPrimitive := false
-]
+			]
-] ifFalse:[
+		    ] ifFalse:[
-inPrimitive ifFalse:[
+			inPrimitive ifFalse:[
-(character == sep) ifTrue:[
+			    (character == sep) ifTrue:[
-self nextPut:sep
+				self nextPut:sep
-]
+			    ]
-]
+			]
-]
+		    ]
-].
+		].
-gotPercent := false
+		gotPercent := false
-].
+	    ].
-self nextPut:character.
+	    self nextPut:character.
-index := index + 1
+	    index := index + 1
-]
+	]
 ].
 self nextPut:sep
 ! !
 !PositionableStream methodsFor:'fileIn'!
 return the value of the last chunk.
 Someone (which is usually some codeView) is notified of errors."
 |lastValue|
-SignalSet anySignal handle:[:ex |
+Object errorSignal handle:[:ex |
-|action what|
+	|action what|
-"handle the case where no GUI has been built in,
+	"handle the case where no GUI has been built in,
-just abort the fileIn with a notification"
+	 just abort the fileIn with a notification"
-Display isNil ifTrue:[
+	Display isNil ifTrue:[
-self notify:(ex signal notifierString ,
+	    self notify:(ex signal notifierString ,
-' in ' , ex suspendedContext sender receiver class name ,
+			 ' in ' , ex suspendedContext sender receiver class name ,
-'>>>' , ex suspendedContext sender selector).
+			 '>>>' , ex suspendedContext sender selector).
-ex return
+	    ex return
-].
+	].
-"otherwise ask what should be done now and either
+	"otherwise ask what should be done now and either
-continue or abort the fileIn"
+	 continue or abort the fileIn"
-what := ex errorString.
+	what := ex errorString.
-what isNil ifTrue:[
+	what isNil ifTrue:[
-what := ex signal notifierString.
+	    what := ex signal notifierString.
-].
+	].
-action := self askForDebug:('error in fileIn: ' , what) withCRs.
+	action := self askForDebug:('error in fileIn: ' , what) withCRs.
-action == #continue ifTrue:[
+	action == #continue ifTrue:[
-ex proceed
+	    ex proceed
-].
+	].
-action == #abort ifTrue:[
+	action == #abort ifTrue:[
-ex return
+	    ex return
-].
+	].
-Debugger enter:ex suspendedContext
+	Debugger enter:ex suspendedContext
-"ex reject"
+	"ex reject"
 ] do:[
-[self atEnd] whileFalse:[
+	[self atEnd] whileFalse:[
-lastValue := self fileInNextChunkNotifying:someone
+	    lastValue := self fileInNextChunkNotifying:someone
-]
+	]
 ].
 ^ lastValue
 !
 fileInNextChunkNotifying:someone
 "read next chunk, evaluate it and return the result;
 someone (which is usually some codeView) is notified of errors."
-|aString sawExcla sep|
+|aString sawExcla sep rslt|
 sep := self class chunkSeparator.
 self skipSeparators.
 self atEnd ifFalse:[
-sawExcla := self peekFor:sep.
+	sawExcla := self peekFor:sep.
-aString := self nextChunk.
+	aString := self nextChunk.
-aString size ~~ 0 ifTrue:[
+	aString size ~~ 0 ifTrue:[
-sawExcla ifFalse:[
+	    rslt := Compiler evaluate:aString notifying:someone.
-^ Compiler evaluate:aString notifying:someone
+	    sawExcla ifTrue:[
-].
+		"
-"
+		 usually, the above chunk consists of some methodsFor:-expression
-usually, the chunk consists of some methodsFor:-expression
+		 in this case, the returned value is a ClassCategoryReader,
-evaluate it (usually returning a ClassCategoryReader) and
+		 which is used to load & compile the methods ...
-let this reader compile the methods
+		"
-"
+		rslt := rslt fileInFrom:self notifying:someone
-^ (Compiler evaluate:aString notifying:someone)
+	    ]
-fileInFrom:self notifying:someone
+	]
-]
 ].
-^ nil
+^ rslt
 !
 askForDebug:message
 "launch a box asking if a debugger is wanted - used when an error
 |box|
 box := OptionBox title:message numberOfOptions:3.
 box actions:(Array with:[^ #abort]
-with:[^ #debug]
+		       with:[^ #debug]
-with:[^ #continue]).
+		       with:[^ #continue]).
 box buttonTitles:#('abort' 'debug' 'continue').
 box showAtPointer.
 ^ #abort
 ! !

changeset 159	514c749165c3
parent 93	e31220cb391f
child 180	c488255bd0be