ReadEvalPrintLoop.st
changeset 22738 0de46478c392
parent 22736 db668a5e0106
child 22739 d39b0b0008ce
--- a/ReadEvalPrintLoop.st	Sun May 06 18:07:42 2018 +0200
+++ b/ReadEvalPrintLoop.st	Sun May 06 18:16:11 2018 +0200
@@ -1032,9 +1032,16 @@
                     prompt isNil ifTrue:[
                         ex reject
                     ].
-                    MiniDebugger enterWithMessage:(ex errorString) mayProceed:true.
-                    ex mayProceed ifTrue:[
-                        ex proceed.
+                    (self confirmDebugger not
+                    or:[ ex creator isControlInterrupt
+                    or:[ self askYesNo:('Error encountered: %1\Debug? '
+                                        bindWith:ex description)]]
+                    ) ifTrue:[
+                        MiniDebugger enterWithMessage:(ex errorString) mayProceed:true.
+                        "/ if we arrive here, user typed 'c' - continue
+                        ex mayProceed ifTrue:[
+                            ex proceed.
+                        ].
                     ].
                     error showCR:('Evaluation aborted: ', ex description).
                     ex return.
@@ -1048,6 +1055,7 @@
                                         compile:true.
                         ].    
                         doPrint ifTrue:[
+                            'Return value: ' print.
                             value printOn:output. output cr.
                             output flush.
                         ].
@@ -1058,7 +1066,9 @@
                         ].
                         doPrint ifTrue:[
                             value isVoid ifFalse:[
+                                'Return value: ' print.
                                 value printOn:output. output cr.
+                                output flush.
                             ].
                         ].