Mercurial > octave

comparison libinterp/parse-tree/bp-table.cc @ 30900:41101f2facdc stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix incorrect return value for dbstatus() and interrupts (bug #62248) * bp-table.cc (stop_on_err_warn_status): Return 'octave_value ("")', i.e., an empty string for "intr" field when debug_on_interrupt() is true.
author Rik <rik@octave.org>
date Tue, 05 Apr 2022 13:53:48 -0700
parents 796f54d4ddbf
children f6c74e01e294 fc3b7160ba77
comparison
equal deleted inserted replaced
30886:05328c2145ff 30900:41101f2facdc
1060 if (m_errors_that_stop.empty ()) 1060 if (m_errors_that_stop.empty ())
1061 { 1061 {
1062 if (to_screen) 1062 if (to_screen)
1063 octave_stdout << "stop if error\n"; 1063 octave_stdout << "stop if error\n";
1064 else 1064 else
1065 retval.assign ("errs", octave_value("")); 1065 retval.assign ("errs", octave_value (""));
1066 } 1066 }
1067 else 1067 else
1068 { 1068 {
1069 Cell errs (dim_vector (bp_table::m_errors_that_stop.size (), 1)); 1069 Cell errs (dim_vector (bp_table::m_errors_that_stop.size (), 1));
1070 int i = 0; 1070 int i = 0;
1087 if (m_caught_that_stop.empty ()) 1087 if (m_caught_that_stop.empty ())
1088 { 1088 {
1089 if (to_screen) 1089 if (to_screen)
1090 octave_stdout << "stop if caught error\n"; 1090 octave_stdout << "stop if caught error\n";
1091 else 1091 else
1092 retval.assign ("caught", octave_value("")); 1092 retval.assign ("caught", octave_value (""));
1093 } 1093 }
1094 else 1094 else
1095 { 1095 {
1096 Cell errs (dim_vector (m_caught_that_stop.size (), 1)); 1096 Cell errs (dim_vector (m_caught_that_stop.size (), 1));
1097 int i = 0; 1097 int i = 0;
1114 if (m_warnings_that_stop.empty ()) 1114 if (m_warnings_that_stop.empty ())
1115 { 1115 {
1116 if (to_screen) 1116 if (to_screen)
1117 octave_stdout << "stop if warning\n"; 1117 octave_stdout << "stop if warning\n";
1118 else 1118 else
1119 retval.assign ("warn", octave_value("")); 1119 retval.assign ("warn", octave_value (""));
1120 } 1120 }
1121 else 1121 else
1122 { 1122 {
1123 Cell warn (dim_vector (m_warnings_that_stop.size (), 1)); 1123 Cell warn (dim_vector (m_warnings_that_stop.size (), 1));
1124 int i = 0; 1124 int i = 0;
1139 if (Vdebug_on_interrupt) 1139 if (Vdebug_on_interrupt)
1140 { 1140 {
1141 if (to_screen) 1141 if (to_screen)
1142 octave_stdout << "stop if interrupt\n"; 1142 octave_stdout << "stop if interrupt\n";
1143 else 1143 else
1144 retval.assign ("intr", octave_value ()); 1144 retval.assign ("intr", octave_value (""));
1145 } 1145 }
1146 1146
1147 return retval; 1147 return retval;
1148 } 1148 }
1149 } 1149 }