hg/stx-libtool: comparison DebugView.st

equal deleted inserted replaced

-:d550d7de8e2d
+:ba8c5416aa28
 "
 if this is a noHandler exception, skip forward
 to the erronous context
 "
 ex notNil ifTrue:[
-ex signal == Signal noHandlerSignal ifTrue:[
+ex creator == Signal noHandlerSignal ifTrue:[
 found := ex suspendedContext
 ]
 ].
 "/ Transcript show:'1 '; showCR:found.
 found isNil ifTrue:[
 "
 have to catch errors occuring in unwind-blocks
 "
 self cacheMyself.
+con := thisContext sender.
 Error handle:[:ex |
 'DebugView [info]: ignored error while unwinding: ' infoPrint.
 ex description infoPrintCR.
 ex proceed
 ] do:[
 "/ find the enter:select context.
-con := thisContext sender.
+[(con selector ~~ #enter:select:) or:[con receiver ~~ self]] whileTrue:[
-[
+con := con sender
-(con selector == #enter:select:)
+].
-and:[con receiver == self]
-]
-whileFalse:[ con := con sender ].
 "/ must skip over its caller (because this one has a ControlInterrupt handler too)
 con sender receiver == self class ifTrue:[
 con := con sender.
 con sender receiver == self class ifTrue:[
-con := con sender.
+con := con sender methodHome.
-con isBlockContext ifTrue:[
-con := con methodHome.
-]
 ].
 ].
 con unwindThenDo:aBlock.
 ].
 !DebugView methodsFor:'interrupt handling'!
 contextInterrupt
 DebuggingDebugger == true ifTrue:[
 'contextIRQ' printCR.
-thisContext sender fullPrint.
+thisContext methodHome sender fullPrint.
 ].
 self stepOrNext
 "Modified: / 30.10.1997 / 21:22:25 / cg"
 !
 exContext := thisContext findSpecialHandle:false raise:true.
 (exContext notNil
 and:[ (ex := exContext receiver) isLazyValue not
 and:[ ex isException
-and:[ ex signal == NoHandlerError
+and:[ ex creator == NoHandlerError
-and:[ ex parameter signal == RecursionError]]]])
+and:[ ex exception creator == RecursionError]]]])
 ifTrue:[
 "/ debug due to unhandled recursionInterrupt.
 "/ ask if we should proceed with more stack.
 answer := self confirm:'Debugger entered due to a stack overflow.\\Continue with more stack ?' withCRs.
 ].
 "/ code for a setter
 (selector numArgs == 1
 and:[(selector endsWith:':')
-and:[receiversClass instVarNames includes:(selector copyWithoutLast:1)]])
+and:[receiversClass instVarNames includes:(selector copyButLast:1)]])
 ifTrue:[
-varName := selector copyWithoutLast:1.
+varName := selector copyButLast:1.
 argName := argNames first.
 code := '%1\' , haltStmtFix , '\    %3 := %4.'.
 cat := 'accessing'.
 ].
 WindowGroup setActiveGroup:windowGroup.
 SignalSet anySignal handle:[:ex |
 |signal|
-signal := ex signal.
+signal := ex creator.
 (UserNotification accepts:signal) ifTrue:[
 Transcript showCR:'UserNotification'.
 (signal ~~ ActivityNotificationSignal) ifTrue:[
 self showError:ex description.
 ].
 active group.
 "
 SignalSet anySignal handle:[:ex |
 |answer signal eMsg|
-signal := ex signal.
+signal := ex creator.
 DebuggingDebugger ~~ true ifTrue:[
 (signal == ActivityNotification) ifTrue:[
 ex proceed
 ].
 ex reject
 ].
 ex return.
 ].
 signal == RecursiveExceptionError ifTrue:[
-(ex parameter signal == BreakPointInterrupt)
+(ex exception creator == BreakPointInterrupt)
 ifTrue:[
 'DebugView [info]: recursive breakpoint in debugger ignored' infoPrintCR.
 ex proceed.
 ].
 self showError:'*** Recursive error in debugger:
->>>> Signal:  ' , ex signal printString , '
+>>>> Signal:  ' , ex creator printString , '
->>>>          ' , ex parameter signal printString , '
+>>>>          ' , ex parameter creator printString , '
 >>>> In:      ' , ex suspendedContext printString , '
 >>>> From:    ' , ex suspendedContext sender printString , '
 >>>>     :    ' , ex suspendedContext sender sender printString , '
 >>>>     :    ' , ex suspendedContext sender sender sender printString , '
 >>>>     :    ' , ex suspendedContext sender sender sender sender printString , '
 ].
 self topView raiseDeiconified.
 eMsg := ex description.
-(ex signal isControlInterrupt) ifTrue:[
+(signal isControlInterrupt) ifTrue:[
 eMsg := eMsg , Character cr asString , 'in ' , ex suspendedContext printString
 ].
 Dialog aboutToOpenBoxNotificationSignal
 handle:[:ex | ex proceed ]
 do:[
 do:[
 Error
 handle:[:ex |
 |s con|
-ex signal isControlInterrupt ifTrue:[
+ex creator isControlInterrupt ifTrue:[
 'DebugView [info]: halt/break ignored - while showing selection in debugger'
 infoPrintCR.
 ex proceed
 ].
 ('DebugView [info]: error at %1 when showing selection in debugger ignored'
 "/ not covered by Error, anyway
 "/                            ex signal == BreakPointInterrupt ifTrue:[
 "/                                ex proceed.
 "/                            ].
 code := 'error while asking method for its source'.
-code := code , Character cr , ex signal printString.
+code := code , Character cr , ex creator printString.
 code := code , Character cr , 'in: ' , ex suspendedContext printString.
 canAccept := false.
 ex return.
 ] do:[
 "/ not covered by Error, anyway
 "/                        ex signal isControlInterrupt ifTrue:[
 "/                            ex proceed.
 "/                        ].
 code := 'error while asking method for its source'.
-code := code , Character cr , ex signal printString.
+code := code , Character cr , ex creator printString.
 code := code , Character cr , 'in: ' , ex suspendedContext printString.
 canAccept := false.
 ex return.
 ] do:[
 !DebugView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.581 2013-04-16 16:20:09 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.584 2013-05-07 13:16:27 stefan Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.581 2013-04-16 16:20:09 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.584 2013-05-07 13:16:27 stefan Exp $'
 !
 version_HG
 ^ '$Changeset: <not expanded> $'

branch	jv
changeset 12807	ba8c5416aa28
parent 12682	6fb2176bf0fa
parent 12743	43616af3d027
child 12819	0ce340e972c4