--- a/GenericException.st Fri Jun 11 19:09:49 2004 +0200
+++ b/GenericException.st Fri Jun 11 19:16:46 2004 +0200
@@ -1263,7 +1263,8 @@
]
].
- AbortOperationRequest raise
+ AbortOperationRequest raise.
+ "not reached"
]
"test with (try a few halts or CTRL-C's):
@@ -1289,20 +1290,20 @@
moved there - it is (for now) left here for backward compatibility."
^ [:ex |
- (ex signal == NoHandlerError
- and:[ex parameter signal inheritsFrom:ControlInterrupt]) ifTrue:[
- "/ go directly into the debugger ...
- Debugger
- enter:ex suspendedContext
- withMessage:ex description
- mayProceed:true
- ] ifFalse:[
- "/ ask, and maybe go into the debugger ...
- nil
- errorNotify:ex description
- from:ex suspendedContext
- allowDebug:true
- ]
+ (ex signal == NoHandlerError
+ and:[ex parameter signal inheritsFrom:ControlInterrupt]) ifTrue:[
+ "/ go directly into the debugger ...
+ ^ Debugger
+ enter:ex suspendedContext
+ withMessage:ex description
+ mayProceed:true
+ ] ifFalse:[
+ "/ ask, and maybe go into the debugger ...
+ ^ nil
+ errorNotify:ex description
+ from:ex suspendedContext
+ allowDebug:true
+ ]
]
"test with (NOTE: halt, breakpoints or CTRL-C's still go straight into the debugger):
@@ -1329,33 +1330,33 @@
^ [:ex |
- |theException|
-
- Processor activeProcessIsSystemProcess ifTrue:[
- 'EmergencyHandler [info]: exception cought: ' errorPrint.
- ex signal == NoHandlerError ifTrue:[
- theException := ex parameter.
- ] ifFalse:[
- theException := ex
- ].
- theException description errorPrintCR.
- AbortSignal raise.
- ] ifFalse:[
- (ex signal == NoHandlerError
- and:[ex parameter signal inheritsFrom:ControlInterrupt]) ifTrue:[
- "/ go directly into the debugger ...
- Debugger
- enter:ex suspendedContext
- withMessage:ex description
- mayProceed:true
- ] ifFalse:[
- "/ ask, and maybe go into the debugger ...
- nil
- errorNotify:ex description
- from:ex suspendedContext
- allowDebug:true
- ]
- ]
+ |theException|
+
+ Processor activeProcessIsSystemProcess ifTrue:[
+ 'EmergencyHandler [info]: exception cought: ' errorPrint.
+ ex signal == NoHandlerError ifTrue:[
+ theException := ex parameter.
+ ] ifFalse:[
+ theException := ex
+ ].
+ theException description errorPrintCR.
+ AbortOperationRequest raise.
+ ] ifFalse:[
+ (ex signal == NoHandlerError
+ and:[ex parameter signal inheritsFrom:ControlInterrupt]) ifTrue:[
+ "/ go directly into the debugger ...
+ ^ Debugger
+ enter:ex suspendedContext
+ withMessage:ex description
+ mayProceed:true
+ ] ifFalse:[
+ "/ ask, and maybe go into the debugger ...
+ ^ nil
+ errorNotify:ex description
+ from:ex suspendedContext
+ allowDebug:true
+ ]
+ ]
]
"test with:
@@ -1625,22 +1626,21 @@
|msg|
rejected == true ifTrue:[
- msg := 'unhandled (rejected)'
+ msg := 'unhandled (rejected)'
] ifFalse:[
- msg := 'unhandled'
+ msg := 'unhandled'
].
msg := msg , ' exception: (' , self description , ')'.
self mayProceed ifTrue:[
- ^ NoHandlerError
- raiseRequestWith:self
- errorString:msg
- in:suspendedContext.
+ ^ NoHandlerError
+ raiseRequestWith:self
+ errorString:msg
+ in:suspendedContext.
].
- NoHandlerError
- raiseWith:self
- errorString:msg
- in:suspendedContext.
-
+ ^ NoHandlerError
+ raiseWith:self
+ errorString:msg
+ in:suspendedContext.
! !
!GenericException methodsFor:'default values'!
@@ -2290,7 +2290,7 @@
!GenericException class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.87 2004-04-14 09:07:50 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/GenericException.st,v 1.88 2004-06-11 17:16:46 stefan Exp $'
! !
GenericException initialize!