hg/stx-libtool: comparison DebugView.st

equal deleted inserted replaced

-:80523e9db49f
+:41587c52f59c
 ign := IgnoredHalt new method:haltingMethod lineNumber:lineNrOfHalt.
 (countOrNil notNil and:[countOrNil > 0]) ifTrue:[
 ign ignoreCount:countOrNil.
 ].
 (dTOrNil notNil) ifTrue:[
 ign ignoreEndTime:(Timestamp now + dTOrNil).
 ].
 IgnoredHalts add:ign.
 ].
 Smalltalk changed:#ignoredHalts.
+"Modified: / 22-10-2010 / 13:52:02 / cg"
+!
+isHaltToBeIgnored
+|c haltingMethod lineNrInHaltingMethod|
+"/ should a halt be ignored ?
+IgnoredHalts isNil ifTrue:[^ false].
+"/ look for a breakpoint-wrapper's context
+c := thisContext findNextContextWithSelector:#doRaise or:nil or:nil.
+c notNil ifTrue:[
+(c receiver isKindOf:NoHandlerError) ifTrue:[
+c := c sender findNextContextWithSelector:#doRaise or:nil or:nil.
+].
+(c receiver isKindOf:BreakPointInterrupt) ifFalse:[
+c := nil
+] ifTrue:[
+[ (c sender receiver isKindOf:BreakPointInterrupt)
+or:[ c sender receiver == BreakPointInterrupt ]] whileTrue:[
+c := c sender
+].
+[ c sender isBlockContext ] whileTrue:[
+c := c sender
+].
+].
+].
+c isNil ifTrue:[
+"/ look for halts or explicit breakpoints
+c := thisContext findNextContextWithSelector:#halt or:#halt: or:nil.
+c isNil ifTrue:[
+c := thisContext findNextContextWithSelector:#breakPoint: or:#breakPoint:info: or:nil.
+c isNil ifTrue:[
+^ false
+].
+].
+].
+c := c sender.
+haltingMethod := c method.
+haltingMethod isWrapped ifTrue:[
+lineNrInHaltingMethod := 1.
+] ifFalse:[
+lineNrInHaltingMethod := c lineNumber.
+"/ Transcript showCR:c.
+].
+^ self
+isHaltToBeIgnoredIn:haltingMethod
+atLineNr:lineNrInHaltingMethod
+modifyEntryCount:true.
+"Created: / 22-10-2010 / 12:09:53 / cg"
+"Modified: / 22-10-2010 / 13:51:25 / cg"
 !
 isHaltToBeIgnoredIn:haltingMethod atLineNr:lineNrInHaltingMethod
 ^ self
 isHaltToBeIgnoredIn:haltingMethod
 IgnoredHalts remove:ign ifAbsent:[].
 ].
 ^ true.
 ].
 ].
 IgnoredHalts := IgnoredHalts
 select:[:ign |
-ign isActive
+ign isActive and:[ (ign isForMethod:haltingMethod line:lineNrInHaltingMethod) not ]
-and:[ (ign isForMethod:haltingMethod line:lineNrInHaltingMethod) not ]
 ].
 IgnoredHalts isEmpty ifTrue:[
 IgnoredHalts := nil.
 ].
 ^ false.
+"Modified: / 22-10-2010 / 13:51:45 / cg"
 !
 removeInactiveIgnores
 IgnoredHalts notNil ifTrue:[
 IgnoredHalts := IgnoredHalts select:[:i | i isActive].
 (
 (MenuItem
 label: 'Continue'
 itemValue: doContinue
 translateLabel: true
+shortcutKey: Cmdc
+)
+(MenuItem
+label: 'Next (Line-Step)'
+itemValue: doNext
+translateLabel: true
+shortcutKey: Cmdn
+)
+(MenuItem
+label: 'Step'
+itemValue: doStep
+translateLabel: true
+shortcutKey: Cmds
 )
 (MenuItem
 label: '-'
 )
 (MenuItem
 label: 'Abort'
 itemValue: doAbort
 translateLabel: true
+shortcutKey: Cmdx
 )
 (MenuItem
 enabled: abortAllIsHandled
 label: 'Abort All'
 itemValue: doAbortAll
 )
 )
 nil
 nil
 )
-"Modified: / 19-10-2010 / 12:59:06 / cg"
 ! !
 !DebugView class methodsFor:'misc'!
 interestingContextFrom:aContext
 "/'entering: ' print. aContext printCR.
 "/'initial: ' print. initialSelectionOrNil printCR.
 thisContext sender fixAllLineNumbers. "/ _CONTEXTLINENOS(s)
-self isHaltToBeIgnored ifTrue:[
+self class isHaltToBeIgnored ifTrue:[
 ^ self.
 ].
 iAmNew := drawableId isNil.
 ]
 "Modified: / 17-04-1997 / 13:01:32 / stefan"
 "Created: / 30-10-1997 / 21:08:18 / cg"
 "Modified: / 13-10-1998 / 19:56:59 / ps"
-"Modified: / 28-07-2007 / 12:12:03 / cg"
+"Modified: / 22-10-2010 / 12:10:09 / cg"
 !
 exit_abort
 "/ cannot simply raise an abort here, because if there is an abortHandler somewhere,
 "/ that one would run on top of this context.
 addIgnoredHaltForCount:countOrNil orTimeDuration:dTOrNil
 |haltingContext haltingMethod lineNrOfHalt|
 haltingContext := self findHaltingContext.
-haltingContext isNil ifTrue:[ ^ self ].
+haltingContext isNil ifTrue:[ Transcript showCR:'no halting context found'. ^ self ].
 haltingMethod := haltingContext method.
 lineNrOfHalt := haltingContext lineNumber.
 self class
 ignoreHaltIn:haltingMethod at:lineNrOfHalt
 forCount:countOrNil orTimeDuration:dTOrNil
-"Modified: / 20-10-2010 / 10:18:19 / cg"
+"Modified: / 22-10-2010 / 13:50:47 / cg"
 !
 busy
 ^ busy
 !
 !DebugView methodsFor:'private queries'!
 isAborting
 ^ exitAction == #abort
-!
-isHaltToBeIgnored
-|c haltingMethod lineNrInHaltingMethod|
-"/ should a halt be ignored ?
-IgnoredHalts isNil ifTrue:[^ false].
-c := thisContext findNextContextWithSelector:#halt or:#halt: or:nil.
-c isNil ifTrue:[
-c := thisContext findNextContextWithSelector:#breakPoint: or:#breakPoint:info: or:nil.
-].
-c isNil ifTrue:[^ false].
-c := c sender.
-haltingMethod := c method.
-lineNrInHaltingMethod := c lineNumber.
-"/ Transcript showCR:c.
-^ self class
-isHaltToBeIgnoredIn:haltingMethod
-atLineNr:lineNrInHaltingMethod
-modifyEntryCount:true.
 !
 setOfHiddenCallingSelectors
 ^ setOfHiddenCallingSelectors ? #( #'doIt' #'doIt:' )
 !
 "/ no longer valid
 weakMethodHolder at:1 put:nil.
 ^ nil
 ].
 ].
 ^ m
+"Modified: / 22-10-2010 / 13:50:29 / cg"
 !
 method:methodArg lineNumber:lineNumberArg
-self assert:(methodArg mclass notNil).
+"/ self assert:(methodArg mclass notNil).
 weakMethodHolder := WeakArray with:methodArg.
 lineNumber := lineNumberArg.
+"Modified: / 22-10-2010 / 12:01:19 / cg"
 ! !
 !DebugView::IgnoredHalt methodsFor:'misc'!
 decrementIgnoreCount
 printOn:aStream
 self method isNil ifTrue:[
 aStream nextPutAll:'an obsolete IgnoredHalt'.
 ^ self
 ].
 aStream nextPutAll:'Ignore '.
 self method printOn:aStream.
 ignoreEndTime notNil ifTrue:[
 aStream nextPutAll:'until '.
 ignoreEndTime printOn:aStream.
 ] ifFalse:[
 aStream nextPutAll:' no longer'.
 ].
 ].
 ].
+"Modified: / 22-10-2010 / 13:34:20 / cg"
 ! !
 !DebugView::IgnoredHalt methodsFor:'queries'!
 haltIgnoredInfoString
 ! !
 !DebugView class methodsFor:'documentation'!
 version
-^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.506 2010-10-20 09:04:28 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.507 2010-10-22 11:53:56 cg Exp $'
 !
 version_CVS
-^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.506 2010-10-20 09:04:28 cg Exp $'
+^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.507 2010-10-22 11:53:56 cg Exp $'
 ! !
 DebugView initialize!

changeset 9590	41587c52f59c
parent 9586	592d4c8dad46
child 9593	62d7ae50438e