hg/stx-libbasic: comparison PositionableStream.st

equal deleted inserted replaced

-:b399f3d19084
+:630807cd320f
 initialize
 "setup the signal used to handle errors during fileIn"
 ZeroPosition := 1.
 ErrorDuringFileInSignal isNil ifTrue:[
-	ErrorDuringFileInSignal := ErrorSignal newSignalMayProceed:true.
+ErrorDuringFileInSignal := Error newSignalMayProceed:true.
-	ErrorDuringFileInSignal nameClass:self message:#errorDuringFileInSignal.
+ErrorDuringFileInSignal nameClass:self message:#errorDuringFileInSignal.
-	ErrorDuringFileInSignal notifierString:'error during fileIn'.
+ErrorDuringFileInSignal notifierString:'error during fileIn'.
 "/        InvalidPositionErrorSignal := PositionErrorSignal newSignalMayProceed:true.
 "/        InvalidPositionErrorSignal nameClass:self message:#invalidPositionErrorSignal.
-	InvalidPositionErrorSignal := PositionOutOfBoundsError.
+InvalidPositionErrorSignal := PositionOutOfBoundsError.
-	InvalidPositionErrorSignal notifierString:'position out of bounds: '.
+InvalidPositionErrorSignal notifierString:'position out of bounds: '.
-	CurrentFileInDirectoryQuerySignal := QuerySignal new.
+CurrentFileInDirectoryQuerySignal := QuerySignal new.
-	CurrentFileInDirectoryQuerySignal nameClass:self message:#currentFileInDirectoryQuerySignal.
+CurrentFileInDirectoryQuerySignal nameClass:self message:#currentFileInDirectoryQuerySignal.
-	CurrentFileInDirectoryQuerySignal notifierString:'query for current directory when filing in'.
+CurrentFileInDirectoryQuerySignal notifierString:'query for current directory when filing in'.
-	CurrentFileInDirectoryQuerySignal handlerBlock:[:ex | ex proceedWith:Filename currentDirectory].
+CurrentFileInDirectoryQuerySignal handlerBlock:[:ex | ex proceedWith:Filename currentDirectory].
 ]
 ! !
 !PositionableStream class methodsFor:'instance creation'!
 dontAskSignals askSomeoneForPackage redef outerContext|
 self skipSeparators.
 lastValue := self peek.
 lastValue == $< ifTrue:[
-	"/ assume, its an xml file
+"/ assume, its an xml file
-	^ self fileInXMLNotifying:someone passChunk:passChunk.
+^ self fileInXMLNotifying:someone passChunk:passChunk.
 ].
 lastValue == $# ifTrue:[
-	"assume unix interpreter name:
+"assume unix interpreter name:
-	 '#!!stx -e' or something like this"
+'#!!stx -e' or something like this"
-	self nextPeek == $!! ifTrue:[
+self nextPeek == $!! ifTrue:[
-	    "skip the unix command line"
+"skip the unix command line"
-	    self nextLine
+self nextLine
-	] ifFalse:[
+] ifFalse:[
-	     self error:'Invalid chunk start'
+self error:'Invalid chunk start'
-	]
+]
 ].
 Smalltalk::Compiler isNil ifTrue:[
-	self isFileStream ifTrue:[
+self isFileStream ifTrue:[
-	    Transcript show:('[' , self pathName , '] ').
+Transcript show:('[' , self pathName , '] ').
-	].
+].
-	Transcript showCR:'cannot fileIn (no compiler).'.
+Transcript showCR:'cannot fileIn (no compiler).'.
-	^ nil.
+^ nil.
 ].
 "/ support for V'Age applications
 defaultApplicationQuerySignal := Class defaultApplicationQuerySignal.
 changeDefaultApplicationNotificationSignal := Class changeDefaultApplicationNotificationSignal.
 packageQuerySignal := Class packageQuerySignal.
 nameSpaceQuerySignal := Class nameSpaceQuerySignal.
 usedNameSpaceQuerySignal := Class usedNameSpaceQuerySignal.
 (someone respondsTo:#packageToInstall) ifFalse:[
-	pkg := packageQuerySignal query.
+pkg := packageQuerySignal query.
-	askSomeoneForPackage := false.
+askSomeoneForPackage := false.
 ] ifTrue:[
-	pkg := someone packageToInstall.
+pkg := someone packageToInstall.
-	askSomeoneForPackage := true.
+askSomeoneForPackage := true.
 ].
 (someone respondsTo:#currentNameSpace) ifFalse:[
-	spc := nameSpaceQuerySignal query.
+spc := nameSpaceQuerySignal query.
 ] ifTrue:[
-	spc := someone currentNameSpace
+spc := someone currentNameSpace
 ].
 (someone respondsTo:#usedNameSpaces) ifFalse:[
-	spaces := usedNameSpaceQuerySignal query.
+spaces := usedNameSpaceQuerySignal query.
 ] ifTrue:[
-	spaces := someone usedNameSpaces
+spaces := someone usedNameSpaces
 ].
 (someone respondsTo:#defaultApplication) ifFalse:[
-	defaultApplication := defaultApplicationQuerySignal query.
+defaultApplication := defaultApplicationQuerySignal query.
 ] ifTrue:[
-	defaultApplication := someone defaultApplication
+defaultApplication := someone defaultApplication
 ].
 confirmationQuerySignal := Metaclass confirmationQuerySignal.
 passedSignals := IdentitySet new.
 handledSignals add:packageQuerySignal.
 handledSignals add:usedNameSpaceQuerySignal.
 handledSignals add:nameSpaceQuerySignal.
-handledSignals add:(Object errorSignal).
+handledSignals add:Error.
-passedSignals add:(Object errorSignal).
+passedSignals add:Error.
 handledSignals add:(Class methodRedefinitionSignal).
 passedSignals add:(Class methodRedefinitionSignal).
 handledSignals add:(Class classRedefinitionSignal).
 passedSignals add:(Class classRedefinitionSignal).
 passedSignals add:confirmationQuerySignal.
 outerContext := thisContext.
 handledSignals handle:[:ex |
-	|sig action what sender msg param oldPackage newPackage proceedValue
+|sig action what sender msg param oldPackage newPackage proceedValue
-	 canContinueForAll|
+canContinueForAll|
-	sig := ex signal.
+sig := ex signal.
 "/sig == packageQuerySignal ifTrue:[
 "/self halt.
 "/].
-	(passedSignals includes:sig) ifTrue:[
+(passedSignals includes:sig) ifTrue:[
-	    (sig isHandledIn:outerContext) ifTrue:[
+(sig isHandledIn:outerContext) ifTrue:[
-		ex reject
+ex reject
-	    ]
+]
-	].
+].
-	sig == changeDefaultApplicationNotificationSignal ifTrue:[
+sig == changeDefaultApplicationNotificationSignal ifTrue:[
-	    "/ invoked via #becomeDefault to set the defaultApp and the package.
+"/ invoked via #becomeDefault to set the defaultApp and the package.
-	    "/ (only when filing in V'Age code)
+"/ (only when filing in V'Age code)
-	    defaultApplication := ex parameter.
+defaultApplication := ex parameter.
-	    pkg := defaultApplication name asSymbol.
+pkg := defaultApplication name asSymbol.
-	    ex proceedWith:nil
+ex proceedWith:nil
-	].
+].
-	sig == defaultApplicationQuerySignal ifTrue:[
+sig == defaultApplicationQuerySignal ifTrue:[
-	    "/ query for the application to add classes & methods into
+"/ query for the application to add classes & methods into
-	    "/ (only when filing in V'Age code)
+"/ (only when filing in V'Age code)
-	    ex proceedWith:defaultApplication
+ex proceedWith:defaultApplication
-	].
+].
-	sig == packageQuerySignal ifTrue:[
+sig == packageQuerySignal ifTrue:[
-	    "/ query for the package to use for classes & methods
+"/ query for the package to use for classes & methods
-	    askSomeoneForPackage ifTrue:[
+askSomeoneForPackage ifTrue:[
-		ex proceedWith:someone packageToInstall
+ex proceedWith:someone packageToInstall
-	    ] ifFalse:[
+] ifFalse:[
-		ex proceedWith:pkg
+ex proceedWith:pkg
-	    ]
+]
-	].
+].
-	sig == usedNameSpaceQuerySignal ifTrue:[
+sig == usedNameSpaceQuerySignal ifTrue:[
-	    "/ query for the namespaces searched when encountering globals
+"/ query for the namespaces searched when encountering globals
-	    ex proceedWith:spaces
+ex proceedWith:spaces
-	].
+].
-	sig == nameSpaceQuerySignal ifTrue:[
+sig == nameSpaceQuerySignal ifTrue:[
-	    "/ query for the namespace to install new classes in
+"/ query for the namespace to install new classes in
-	    ex proceedWith:spc
+ex proceedWith:spc
-	].
+].
-	sig == confirmationQuerySignal ifTrue:[
+sig == confirmationQuerySignal ifTrue:[
-	    ex proceedWith:false "/ no dialogs popping up
+ex proceedWith:false "/ no dialogs popping up
-	].
+].
-	sig == Stream endOfStreamSignal ifTrue:[
+sig == Stream endOfStreamSignal ifTrue:[
-	    ex reject
+ex reject
-	].
+].
-	sig == Signal noHandlerSignal ifTrue:[
+sig == Signal noHandlerSignal ifTrue:[
-	    ex parameter rejected ifTrue:[
+ex parameter rejected ifTrue:[
-		ex reject
+ex reject
-	    ].
+].
-	].
+].
-	(dontAskSignals notNil and:[dontAskSignals includesKey:sig]) ifTrue:[
+(dontAskSignals notNil and:[dontAskSignals includesKey:sig]) ifTrue:[
-	    ex proceedWith:(dontAskSignals at:sig)
+ex proceedWith:(dontAskSignals at:sig)
-	].
+].
-	canContinueForAll := false.
+canContinueForAll := false.
-	redef := false.
+redef := false.
-	"/ for your convenience ...
+"/ for your convenience ...
-	(sig == Class methodRedefinitionSignal) ifTrue:[
+(sig == Class methodRedefinitionSignal) ifTrue:[
-	    param := ex parameter. "/ an association: oldMethod -> newMethod
+param := ex parameter. "/ an association: oldMethod -> newMethod
-	    oldPackage := param key package.
+oldPackage := param key package.
-	    newPackage := param value package.
+newPackage := param value package.
-	    msg := 'trying to overwrite method:\\    ' , param key whoString , '\\in package '''
+msg := 'trying to overwrite method:\\    ' , param key whoString , '\\in package '''
-		   , oldPackage , ''' with method from package ''' , newPackage , ''''.
+, oldPackage , ''' with method from package ''' , newPackage , ''''.
-	    canContinueForAll := true.
+canContinueForAll := true.
-	] ifFalse:[
+] ifFalse:[
-	    (sig == Class classRedefinitionSignal) ifTrue:[
+(sig == Class classRedefinitionSignal) ifTrue:[
-		param := ex parameter. "/ an association: oldClass -> newClass
+param := ex parameter. "/ an association: oldClass -> newClass
-		oldPackage := param key package.
+oldPackage := param key package.
-		newPackage := param value package.
+newPackage := param value package.
-		msg := 'trying to redefine class: ' , param key name allBold , '\\in package '''
+msg := 'trying to redefine class: ' , param key name allBold , '\\in package '''
-		       , oldPackage , ''' with new definition from package ''' , newPackage , ''''.
+, oldPackage , ''' with new definition from package ''' , newPackage , ''''.
-		canContinueForAll := true.
+canContinueForAll := true.
-		redef := true.
+redef := true.
-	    ] ifFalse:[
+] ifFalse:[
-		msg := 'error in fileIn: %1'
+msg := 'error in fileIn: %1'
-	    ]
+]
-	].
+].
-	what := ex errorString.
+what := ex errorString.
-	what isNil ifTrue:[
+what isNil ifTrue:[
-	    what := ex signal notifierString.
+what := ex signal notifierString.
-	].
+].
-	"/ 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:[
-	    sender := ex suspendedContext sender.
+sender := ex suspendedContext sender.
-	    self notify:(what ,
+self notify:(what ,
-			 ' in ' , sender receiver class name ,
+' in ' , sender receiver class name ,
-			 '>>>' , sender selector).
+'>>>' , sender selector).
-	    ex return
+ex return
-	].
+].
-	msg := msg bindWith:what.
+msg := msg bindWith:what.
-	sig == HaltInterrupt ifTrue:[
+sig == HaltInterrupt ifTrue:[
-	    sender := ex suspendedContext.
+sender := ex suspendedContext.
-	    msg := msg , ('\\in ' , sender receiver class name , '>>>' , sender selector) withCRs
+msg := msg , ('\\in ' , sender receiver class name , '>>>' , sender selector) withCRs
-	].
+].
-	"/ 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
-	redef ifTrue:[
+redef ifTrue:[
-	    action := OptionBox
+action := OptionBox
-			  request:(msg withCRs)
+request:(msg withCRs)
-			  label:'Class redefinition in fileIn'
+label:'Class redefinition in fileIn'
-			  form:(WarningBox iconBitmap)
+form:(WarningBox iconBitmap)
 "/ cg: now always keep the old packageID
 "/                          buttonLabels:#('cancel' 'skip' 'debug' 'keep' 'keep all' 'continue' 'continue all')
 "/                          values:#(#abort #skip #debug #keep #keepAll #continue #continueForAll)
-			  buttonLabels:#('Cancel' 'Skip' 'Debug' 'Continue' 'Continue All')
+buttonLabels:#('Cancel' 'Skip' 'Debug' 'Continue' 'Continue All')
-			  values:#(#abort #skip #debug #keep #keepAll)
+values:#(#abort #skip #debug #keep #keepAll)
-			  default:#continue
+default:#continue
-			  onCancel:#abort.
+onCancel:#abort.
-	] ifFalse:[
+] ifFalse:[
-	    action := self askForDebug:msg withCRs canContinueForAll:canContinueForAll.
+action := self askForDebug:msg withCRs canContinueForAll:canContinueForAll.
-	].
+].
-	action == #continueForAll ifTrue:[
+action == #continueForAll ifTrue:[
-	    dontAskSignals isNil ifTrue:[
+dontAskSignals isNil ifTrue:[
-		dontAskSignals := IdentityDictionary new.
+dontAskSignals := IdentityDictionary new.
-	    ].
+].
-	    dontAskSignals at:sig put:#continue.
+dontAskSignals at:sig put:#continue.
-	    action := proceedValue := #continue.
+action := proceedValue := #continue.
-	] ifFalse:[
+] ifFalse:[
-	    action == #keepForAll ifTrue:[
+action == #keepForAll ifTrue:[
-		dontAskSignals isNil ifTrue:[
+dontAskSignals isNil ifTrue:[
-		    dontAskSignals := IdentityDictionary new.
+dontAskSignals := IdentityDictionary new.
-		].
+].
-		dontAskSignals at:sig put:#keep.
+dontAskSignals at:sig put:#keep.
-		action := #continue.
+action := #continue.
-		proceedValue := #keep.
+proceedValue := #keep.
-	    ] ifFalse:[
+] ifFalse:[
-		action == #keep ifTrue:[
+action == #keep ifTrue:[
-		    action := #continue.
+action := #continue.
-		    proceedValue := #keep.
+proceedValue := #keep.
-		].
+].
-	    ].
+].
-	].
+].
-	action == #continue ifTrue:[
+action == #continue ifTrue:[
-	    ex proceedWith:(proceedValue ? #continue)
+ex proceedWith:(proceedValue ? #continue)
-	].
+].
-	action == #abort ifTrue:[
+action == #abort ifTrue:[
-	    AbortSignal raise.
+AbortSignal raise.
-	    ex return
+ex return
-	].
+].
-	action == #cancelAll ifTrue:[
+action == #cancelAll ifTrue:[
-	    AbortAllSignal raise.
+AbortAllSignal raise.
-	    ex return
+ex return
-	].
+].
-	action == #skip ifTrue:[
+action == #skip ifTrue:[
-	    ex proceedWith:nil
+ex proceedWith:nil
-	].
+].
-	action == #debug ifTrue:[
+action == #debug ifTrue:[
-	    Debugger enter:ex suspendedContext
+Debugger enter:ex suspendedContext
-		     withMessage:ex errorString
+withMessage:ex errorString
-		     mayProceed:true.
+mayProceed:true.
-	    ex proceedWith:proceedValue
+ex proceedWith:proceedValue
-	].
+].
-	"/ (ex signal) enterDebuggerWith:ex message:what.
+"/ (ex signal) enterDebuggerWith:ex message:what.
-	ex reject
+ex reject
 ] do:[
-	[self atEnd] whileFalse:[
+[self atEnd] whileFalse:[
-	    lastValue := self fileInNextChunkNotifying:someone passChunk:passChunk
+lastValue := self fileInNextChunkNotifying:someone passChunk:passChunk
-	]
+]
 ].
 ^ lastValue
 "Modified: / 10.9.1999 / 16:54:01 / stefan"
 "Modified: / 16.11.2001 / 16:21:28 / cg"
 ! !
 !PositionableStream class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.123 2003-02-25 11:46:48 cg Exp $'
+^ '$Header: /cvs/stx/stx/libbasic/PositionableStream.st,v 1.124 2003-03-02 20:38:24 stefan Exp $'
 ! !
 PositionableStream initialize!

changeset 7092	630807cd320f
parent 7054	685d359f9847
child 7114	acc13967229e