*** empty log message ***
authorClaus Gittinger <cg@exept.de>
Thu, 07 Dec 2006 19:35:07 +0100
changeset 10263 85f010a3c230
parent 10262 b8ae1cdd9a80
child 10264 0522c2d7c4cf
*** empty log message ***
ReadEvalPrintLoop.st
--- a/ReadEvalPrintLoop.st	Thu Dec 07 19:28:27 2006 +0100
+++ b/ReadEvalPrintLoop.st	Thu Dec 07 19:35:07 2006 +0100
@@ -274,14 +274,26 @@
         ].
 
         chunk notEmptyOrNil ifTrue:[
-            AbortAllOperationRequest handle:[:ex |
+            (AbortOperationRequest,AbortAllOperationRequest) handle:[:ex |
                 error nextPutLine:('Evaluation aborted: ', ex description)
             ] do:[
-                |value|
+                (Error, ControlInterrupt) handle:[:ex |
+                    prompt isNil ifTrue:[
+                        ex reject
+                    ].
+                    MiniDebugger enterWithMessage:(ex errorString) mayProceed:true.
+                    ex mayProceed ifTrue:[
+                        ex proceed.
+                    ].
+                    error nextPutLine:('Evaluation aborted: ', ex description).
+                    ex return.
+                ] do:[
+                    |value|
 
-                value := (compilerClass new requestor:self) evaluate:chunk compile:true.
-                value printOn:output.
-                output cr.
+                    value := (compilerClass new requestor:self) evaluate:chunk compile:true.
+                    value printOn:output.
+                    output cr.
+                ].
             ].
         ].
     ] loop.
@@ -291,11 +303,11 @@
     "
 
     "Created: / 07-12-2006 / 17:27:21 / cg"
-    "Modified: / 07-12-2006 / 19:29:01 / cg"
+    "Modified: / 07-12-2006 / 19:35:42 / cg"
 ! !
 
 !ReadEvalPrintLoop class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/ReadEvalPrintLoop.st,v 1.13 2006-12-07 18:28:27 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/ReadEvalPrintLoop.st,v 1.14 2006-12-07 18:35:07 cg Exp $'
 ! !