hg/stx-libtool: comparison DebugView.st

equal deleted inserted replaced

-:5ae3f3d53865
+:c1a0db432106
 selector := actualContext selector.
 proto := Method methodDefinitionTemplateForSelector:selector.
 self
 codeAccept:('%1\    self halt:''%2 is not yet implemented''.' bindWith:proto with:selector) withCRs
-unwind:false.
+unwind:false
+onCancel:[^ self].
 self doShowSelection:selectionIndex.
 self doRestart
+"Modified: / 16.11.2001 / 13:43:10 / cg"
 !
 doIgnoreBreakpoints
 ignoreBreakpoints := true.
 self initializeMiddleButtonMenu
 "Modified: / 13.1.1998 / 00:24:47 / cg"
 !
 showDenseBacktrace
+|m|
+m := contextView middleButtonMenu.
 verboseBacktrace := false.
-contextView middleButtonMenu labelAt:#showDenseBacktrace put:(resources string:'show verbose backtrace').
+m labelAt:#showDenseBacktrace put:(resources string:'Show verbose backtrace').
-contextView middleButtonMenu selectorAt:#showDenseBacktrace put:#showVerboseBacktrace.
+m selectorAt:#showDenseBacktrace put:#showVerboseBacktrace.
 self redisplayBacktrace.
-"Created: 10.1.1997 / 21:33:55 / cg"
+"Created: / 10.1.1997 / 21:33:55 / cg"
-"Modified: 10.1.1997 / 21:37:21 / cg"
+"Modified: / 16.11.2001 / 13:47:06 / cg"
 !
 showMore
 "double number of contexts shown"
 "Modified: 12.1.1997 / 01:24:26 / cg"
 !
 showVerboseBacktrace
+|m|
 verboseBacktrace := true.
-contextView middleButtonMenu labelAt:#showVerboseBacktrace put:(resources string:'dense stack backtrace').
+m := contextView middleButtonMenu.
-contextView middleButtonMenu selectorAt:#showVerboseBacktrace put:#showDenseBacktrace.
+m labelAt:#showVerboseBacktrace put:(resources string:'Show dense backtrace').
+m selectorAt:#showVerboseBacktrace put:#showDenseBacktrace.
 self redisplayBacktrace.
-"Modified: 10.1.1997 / 21:37:13 / cg"
+"Modified: / 16.11.2001 / 13:46:43 / cg"
 !
 skip
 "skip for cursor line in selected method"
 ]
 ].
 suspendContext notNil ifTrue:[
 con := suspendContext. suspendContext := nil
 ].
+].
+verboseBacktrace ~~ true ifTrue:[
+con notNil ifTrue:[
+"/ hide the halt implementation
+(con selector == #halt
+or:[con selector == #halt:]) ifTrue:[
+con method mclass == Object ifTrue:[
+con := con sender.
+]
+]
+]
 ].
 "
 get them all
 "
 and:[((h selector == #doIt)
 or:[h selector == #doIt:])
 and:[h method who isNil]]]) ifTrue:[
 con := con sender.
 text removeLast.
-text add:(con methodHome printString)
+text add:(con methodHome printString).
 ].
 h := nil.  "/ never keep refs to contexts unless you really need them ...
-].
+"/                "/ and also, all lazy loading intermediates
-"/ and also, all lazy loading intermediates
+"/
+"/                (con selector == #noByteCode
-verboseBacktrace ~~ true ifTrue:[
+"/                and:[con receiver isMethod
-(con selector == #noByteCode
+"/                and:[con receiver isLazyMethod]]) ifTrue:[
-and:[con receiver isMethod
+"/                    contextArray removeLast.
-and:[con receiver isLazyMethod]]) ifTrue:[
+"/                    text removeLast.
-contextArray removeLast.
+"/                    con := con sender.
-text removeLast.
+"/                    count := count - 1.
-con := con sender.
+"/                ]
-count := count - 1.
+].
-]
-].
+"/ with dense backtrace, dont show below the doIt
+( verboseBacktrace ~~ true
-con := con sender
+and:[ con selector == #doIt]) ifTrue:[
+con := nil.
+] ifFalse:[
+con := con sender
+]
 ].
 "
 did we reach the end ?
 "
 m disable:#browseReceiversClass.
 ].
 ^ true
 "Created: / 14.12.1995 / 19:10:31 / cg"
-"Modified: / 30.9.1998 / 21:29:07 / cg"
+"Modified: / 16.11.2001 / 13:59:41 / cg"
 !
 setContextSkippingInterruptContexts:aContext
 "show calling chain from aContext in the walk-back listview.
 Ignore any non-interesting interrupt-context."
 ].
 "Modified: / 15.11.2001 / 17:07:29 / cg"
 !
+codeAccept:someCode unwind:doUnwind onCancel:cancelAction
+"user wants some code to be recompiled - must unwind stack since everything above
+and including selected method cannot be continued."
+"
+actually, this is not true, since the active methods will still be
+executed correctly - however, the code shown in the debugger is no
+longer in sync (showing the new code) with the executed code.
+Therefore, we hide those contexts to avoid confusion ....
+If you dont like this behavior, remove the 'inspecting ifFalse:' check below"
+"walk up context chain and find highest context which is either the selected context,
+or - if its a block-context - whose home is the selected context"
+|con top sel implementorClass method newMethod category|
+codeView withWaitCursorDo:[
+"
+find the method-home context for this one
+"
+con := selectedContext.
+top := con.
+[con notNil] whileTrue:[
+(con methodHome == selectedContext) ifTrue:[
+top := con
+].
+con := con sender
+].
+"
+use class&selector to find the method for the compilation
+and compile.
+"
+sel := selectedContext selector.
+implementorClass := selectedContext methodClass.
+implementorClass notNil ifTrue:[
+method := implementorClass compiledMethodAt:sel.
+category := method category
+] ifFalse:[
+implementorClass := selectedContext receiver class.
+implementorClass ~~ Object ifTrue:[
+implementorClass := Dialog
+request:('Define #''%1'' in which class:' bindWith:sel)
+initialAnswer:implementorClass name
+list:(implementorClass withAllSuperclasses collect:[:each| each name]).
+implementorClass size == 0 ifTrue:[
+^ cancelAction value "/ cancelled
+].
+implementorClass := Smalltalk at:implementorClass asSymbol.
+implementorClass isNil ifTrue:[
+Dialog warn:'no such class'.
+^ cancelAction value "/ cancelled
+].
+].
+category := '* As yet uncategorized *'.
+].
+"/
+"/ provide the classes nameSpace on a query;
+"/ in case we accept while in another nameSpace context,
+"/ (but for a class which is somewhere else)
+"/
+Class updateChangeFileQuerySignal answer:true
+do:[
+Class updateChangeListQuerySignal answer:true
+do:[
+Class nameSpaceQuerySignal
+answer:(implementorClass nameSpace)
+do:[
+newMethod := implementorClass compilerClass
+compile:someCode
+forClass:implementorClass
+inCategory:category
+notifying:codeView.
+].
+].
+].
+inspecting ifFalse:[
+"
+if it worked, remove everything up to and including top
+from context chain
+"
+(newMethod notNil and:[newMethod ~~ #Error]) ifTrue:[
+codeView modified:false.
+doUnwind ifTrue:[
+self setContext:(top sender).
+"
+continue/step is no longer possible
+"
+canContinue := false.
+exitAction := #return.
+].
+self showSelection:1.
+] ifFalse:[
+^ cancelAction value
+]
+].
+].
+"Created: / 16.11.2001 / 13:42:39 / cg"
+"Modified: / 16.11.2001 / 13:44:34 / cg"
+!
 doShowSelection:lineNr
 "user clicked on a header line - show selected code in textView.
 Also sent to autoselect an interesting context on entry."
 |breakPointSignal|
 "/            Object errorSignal handle:[:ex |
 "/                'DebugView [warning]: error while accessing context' errorPrintCR.
 "/                contextInspector inspect:nil.
 "/            ] do:[
 contextInspector inspect:con.
-contextInspector tryToSelectedKeyNamed:lastSelectionInContextInspector.
+contextInspector tryToSelectKeyNamed:lastSelectionInContextInspector.
 "/            ].
 "/ show a stack inspector sometimes
 ] ifFalse:[
 codeView acceptAction:[:code | self device beep]
 ].
 receiverInspector inspect:rec.
-receiverInspector tryToSelectedKeyNamed:lastSelectionInReceiverInspector.
+receiverInspector tryToSelectKeyNamed:lastSelectionInReceiverInspector.
 "
 the one below is wrong: currently, the
 evaluator cannot handle passed contexts.
 Once it does, pass con as in:-arg
 enable/disable some menu items
 "
 self updateMenuItems
 "Created: / 14.8.1997 / 20:15:00 / cg"
-"Modified: / 13.11.1998 / 23:19:35 / cg"
+"Modified: / 16.11.2001 / 13:49:06 / cg"
 !
 updateMenuItems
 |m mthd cls mCls rCls|
 ! !
 !DebugView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.292 2001-11-15 16:10:55 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.293 2001-11-16 13:23:06 cg Exp $'
 ! !
 DebugView initialize!

changeset 3427	c1a0db432106
parent 3412	60d31568ca51
child 3429	1832276b7443