DebugView.st
changeset 581 d1a1ae9d49e4
parent 579 d461478b2ac2
child 583 c85ab3ce67f9
--- a/DebugView.st	Tue May 28 21:05:11 1996 +0200
+++ b/DebugView.st	Wed May 29 13:23:56 1996 +0200
@@ -1387,25 +1387,19 @@
     steppedContextAddress := nil.
     haveControl := false.
     exitAction := #abort.
-    Processor isPureEventDriven ifFalse:[
-        "exit private event-loop"
-        catchBlock notNil ifTrue:[
-            abortButton turnOff.
-            catchBlock value.
-            'DEBUGGER: oops, abort failed' errorPrintNL.
-        ]
+
+    "exit private event-loop"
+    catchBlock notNil ifTrue:[
+        abortButton turnOff.
+        catchBlock value.
+
+        "/ not reached
+        'DEBUGGER: oops, abort failed' errorPrintNL.
     ].
+
     ^ self.
 
-"obsolete ..."
-"/    Processor activeProcess id == 0 ifTrue:[
-"/        "dont allow termination of main-thread"
-"/        exitAction := #abort
-"/    ] ifFalse:[
-"/        exitAction := #terminate 
-"/    ]
-
-    "Modified: 13.4.1996 / 20:33:51 / cg"
+    "Modified: 29.5.1996 / 13:18:39 / cg"
 !
 
 doContinue
@@ -1420,12 +1414,14 @@
         tracing := false.
         haveControl := false.
         exitAction := #continue.
-        Processor isPureEventDriven ifFalse:[
-            "exit private event-loop"
-            catchBlock notNil ifTrue:[catchBlock value].
-            'DEBUGGER: oops, continue failed' errorPrintNL.
-            continueButton turnOff.
-        ].
+
+        "exit private event-loop"
+        catchBlock notNil ifTrue:[catchBlock value].
+
+        "/ not reached.
+        'DEBUGGER: oops, continue failed' errorPrintNL.
+        continueButton turnOff.
+
     ] ifFalse:[
         inspecting ifFalse:[
             'resuming top context' errorPrintNL.
@@ -1434,7 +1430,7 @@
         ]
     ]
 
-    "Modified: 13.4.1996 / 20:33:55 / cg"
+    "Modified: 29.5.1996 / 13:18:29 / cg"
 !
 
 doNext
@@ -1465,14 +1461,15 @@
     steppedContextAddress := nil.
     haveControl := false.
     exitAction := #restart.
-    Processor isPureEventDriven ifFalse:[
-        "exit private event-loop"
-        catchBlock notNil ifTrue:[catchBlock value].
-        'DEBUGGER: oops, restart failed' errorPrintNL.
-        restartButton turnOff.
-    ].
+
+    "exit private event-loop"
+    catchBlock notNil ifTrue:[catchBlock value].
 
-    "Modified: 13.4.1996 / 20:34:00 / cg"
+    "/ not reached
+    'DEBUGGER: oops, restart failed' errorPrintNL.
+    restartButton turnOff.
+
+    "Modified: 29.5.1996 / 13:18:55 / cg"
 !
 
 doReturn
@@ -1489,14 +1486,15 @@
     steppedContextAddress := nil.
     haveControl := false.
     exitAction := #return.
-    Processor isPureEventDriven ifFalse:[
-        "exit private event-loop"
-        catchBlock notNil ifTrue:[catchBlock value].
-        'DEBUGGER: oops, return failed' errorPrintNL.
-        returnButton turnOff.
-    ].
+
+    "exit private event-loop"
+    catchBlock notNil ifTrue:[catchBlock value].
 
-    "Modified: 13.4.1996 / 20:34:03 / cg"
+    "/ not reached
+    'DEBUGGER: oops, return failed' errorPrintNL.
+    returnButton turnOff.
+
+    "Modified: 29.5.1996 / 13:19:12 / cg"
 !
 
 doSend
@@ -1508,15 +1506,16 @@
         steppedContextAddress := nil.
         haveControl := false.
         exitAction := #step.
-        Processor isPureEventDriven ifFalse:[
-            "exit private event-loop"
-            catchBlock notNil ifTrue:[catchBlock value].
-            'DEBUGGER: oops, send failed' errorPrintNL.
-            sendButton turnOff.
-        ].
+
+        "exit private event-loop"
+        catchBlock notNil ifTrue:[catchBlock value].
+
+        "/ not reached
+        'DEBUGGER: oops, send failed' errorPrintNL.
+        sendButton turnOff.
     ]
 
-    "Modified: 13.4.1996 / 20:34:06 / cg"
+    "Modified: 29.5.1996 / 13:19:23 / cg"
 !
 
 doStep
@@ -1563,17 +1562,18 @@
         bigStep := true.
         haveControl := false.
         exitAction := #step.
-        Processor isPureEventDriven ifFalse:[
-            "exit private event-loop"
-            catchBlock notNil ifTrue:[catchBlock value].
-            'DEBUGGER: oops, step failed' errorPrintNL.
-            stepButton turnOff.
-            nextButton turnOff.
-            sendButton turnOff.
-        ].
+
+        "exit private event-loop"
+        catchBlock notNil ifTrue:[catchBlock value].
+
+        "/ not reached
+        'DEBUGGER: oops, step failed' errorPrintNL.
+        stepButton turnOff.
+        nextButton turnOff.
+        sendButton turnOff.
     ]
 
-    "Modified: 13.4.1996 / 20:34:10 / cg"
+    "Modified: 29.5.1996 / 13:19:38 / cg"
 !
 
 doStop
@@ -1596,17 +1596,18 @@
     steppedContextAddress := nil.
     haveControl := false.
     exitAction := #terminate. 
-    Processor isPureEventDriven ifFalse:[
-        "exit private event-loop"
-        catchBlock notNil ifTrue:[catchBlock value].
-        inspecting ifFalse:[
-            'DEBUGGER: oops, terminate failed' errorPrintNL.
-            self warn:'terminate failed'.
-        ].
-        terminateButton turnOff.
+
+    "exit private event-loop"
+    catchBlock notNil ifTrue:[catchBlock value].
+
+    "/ not reached (normally)
+    inspecting ifFalse:[
+        'DEBUGGER: oops, terminate failed' errorPrintNL.
+        self warn:'terminate failed'.
     ].
+    terminateButton turnOff.
 
-    "Modified: 13.4.1996 / 20:34:14 / cg"
+    "Modified: 29.5.1996 / 13:19:57 / cg"
 !
 
 doTrace
@@ -1683,17 +1684,18 @@
     steppedContextAddress := nil.
     haveControl := false.
     exitAction := #quickTerminate.
-    Processor isPureEventDriven ifFalse:[
-        "exit private event-loop"
-        catchBlock notNil ifTrue:[catchBlock value].
-        inspecting ifFalse:[
-            'DEBUGGER: oops, terminate failed' errorPrintNL.
-            self warn:'terminate failed'.
-        ].
-        terminateButton turnOff.
+
+    "exit private event-loop"
+    catchBlock notNil ifTrue:[catchBlock value].
+
+    "/ not reached (normally)
+    inspecting ifFalse:[
+        'DEBUGGER: oops, terminate failed' errorPrintNL.
+        self warn:'terminate failed'.
     ].
+    terminateButton turnOff.
 
-    "Modified: 13.4.1996 / 20:34:18 / cg"
+    "Modified: 29.5.1996 / 13:20:14 / cg"
 !
 
 removeAllBreakpoints
@@ -2542,5 +2544,5 @@
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.85 1996-05-28 16:44:00 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.86 1996-05-29 11:23:56 cg Exp $'
 ! !