DebugView.st
changeset 2591 613b7c72371c
parent 2589 2342403139a7
child 2633 41bd35e18e4e
--- a/DebugView.st	Mon Feb 07 14:38:46 2000 +0100
+++ b/DebugView.st	Tue Feb 08 16:55:38 2000 +0100
@@ -458,6 +458,9 @@
         con isNil ifTrue:[^ 1].
 
         sel := con selector.
+        ((sel == #halt) or:[sel == #halt:]) ifTrue:[
+            ^ i + 1
+        ].
         ((sel == #raise) or:[sel == #raiseRequest]) ifTrue:[
             rcvr := con receiver.
             (rcvr isKindOf:Exception) ifTrue:[
@@ -489,7 +492,8 @@
         "/ show the place where the divisionByZero happend,
         "/ not where the signal was raised.
 
-        sel := aContext selector.
+        sel := aContext methodHome selector.
+
         (sel == #//      
         or:[sel == #/
         or:[sel == #\\]]) ifTrue:[
@@ -509,7 +513,7 @@
 
         "/ show the place of the halt; not where the HaltSignal
         "/ was raised...
-        (sel == #halt) ifTrue:[
+        ((sel == #halt) or:[sel == #halt:]) ifTrue:[
             ^ 2
         ].
 
@@ -608,6 +612,8 @@
     |con selection m idx retval enteredByInterrupt sel con1 con2 h
      iAmNew|
 
+"/'entering: ' print. aContext printCR.
+"/'initial: ' print. initialSelectionOrNil printCR.
     iAmNew := drawableId isNil.
 
     verboseBacktrace := VerboseBacktraceDefault ? false.
@@ -688,6 +694,8 @@
      get the walkback list; clear inspectors if we did not come here by single stepping)
     "
     self setContext:aContext releaseInspectors:(exitAction ~~ #step).
+"/'after setContext; first is ' print.
+"/(contextArray at:1 ifAbsent:nil) printCR.
 
     initialSelectionOrNil notNil ifTrue:[
         selection := initialSelectionOrNil
@@ -703,7 +711,6 @@
         con1 := (contextArray at:1 ifAbsent:nil).
         con2 := (contextArray at:2 ifAbsent:nil).
         exitAction == #step ifTrue:[
-
             selection := 1.
             steppedContext notNil ifTrue:[
             
@@ -4259,6 +4266,6 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.259 2000-02-07 11:43:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.260 2000-02-08 15:55:38 cg Exp $'
 ! !
 DebugView initialize!