Mercurial > hg > octave-nkf
annotate src/error.cc @ 14923:168cb10bb9c5
If, ifelse, and else statements JIT compile now
| author | Max Brister <max@2bass.com> |
|---|---|
| date | Mon, 28 May 2012 23:19:41 -0500 |
| parents | 90c51d8797cc |
| children | 460a3c6d8bf1 |
| rev | line source |
|---|---|
| 1 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
14093
diff
changeset
|
3 Copyright (C) 1993-2012 John W. Eaton |
| 1 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 1 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 1 | 20 |
| 21 */ | |
| 22 | |
| 240 | 23 #ifdef HAVE_CONFIG_H |
| 1192 | 24 #include <config.h> |
| 1 | 25 #endif |
| 26 | |
| 1343 | 27 #include <cstdarg> |
| 1633 | 28 #include <cstring> |
| 1343 | 29 |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
30 #include <iostream> |
| 5765 | 31 #include <sstream> |
| 1728 | 32 #include <string> |
| 33 | |
| 1352 | 34 #include "defun.h" |
| 1 | 35 #include "error.h" |
| 3707 | 36 #include "input.h" |
| 1742 | 37 #include "pager.h" |
| 1352 | 38 #include "oct-obj.h" |
| 5567 | 39 #include "oct-map.h" |
| 1352 | 40 #include "utils.h" |
| 2370 | 41 #include "ov.h" |
| 3707 | 42 #include "ov-usr-fcn.h" |
| 43 #include "pt-pr-code.h" | |
| 44 #include "pt-stmt.h" | |
| 45 #include "toplev.h" | |
| 46 #include "unwind-prot.h" | |
| 2370 | 47 #include "variables.h" |
| 1 | 48 |
| 2174 | 49 // TRUE means that Octave will try to beep obnoxiously before printing |
| 50 // error messages. | |
| 5794 | 51 static bool Vbeep_on_error = false; |
| 2174 | 52 |
| 3707 | 53 // TRUE means that Octave will try to enter the debugger when an error |
| 54 // is encountered. This will also inhibit printing of the normal | |
| 55 // traceback message (you will only see the top-level error message). | |
| 7353 | 56 bool Vdebug_on_error = false; |
| 3707 | 57 |
| 58 // TRUE means that Octave will try to enter the debugger when a warning | |
| 59 // is encountered. | |
| 7353 | 60 bool Vdebug_on_warning = false; |
| 3707 | 61 |
| 5567 | 62 // TRUE means that Octave will try to display a stack trace when a |
| 63 // warning is encountered. | |
| 64 static bool Vbacktrace_on_warning = false; | |
| 65 | |
| 66 // TRUE means that Octave will print a verbose warning. Currently unused. | |
| 67 static bool Vverbose_warning; | |
| 68 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
69 // TRUE means that Octave will print no warnings, but lastwarn will be |
| 5582 | 70 //updated |
| 71 static bool Vquiet_warning = false; | |
| 72 | |
| 5567 | 73 // A structure containing (most of) the current state of warnings. |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
74 static octave_map warning_options; |
| 5567 | 75 |
| 3935 | 76 // The text of the last error message. |
| 77 static std::string Vlast_error_message; | |
| 78 | |
| 3934 | 79 // The text of the last warning message. |
| 80 static std::string Vlast_warning_message; | |
| 81 | |
| 5567 | 82 // The last warning message id. |
| 83 static std::string Vlast_warning_id; | |
| 3934 | 84 |
| 5567 | 85 // The last error message id. |
| 86 static std::string Vlast_error_id; | |
| 3934 | 87 |
| 6361 | 88 // The last file in which an error occured |
|
10767
2b041d3995a3
modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10605
diff
changeset
|
89 static octave_map Vlast_error_stack; |
| 6361 | 90 |
| 143 | 91 // Current error state. |
| 3935 | 92 // |
| 93 // Valid values: | |
| 94 // | |
| 95 // -2: an error has occurred, but don't print any messages. | |
| 96 // -1: an error has occurred, we are printing a traceback | |
| 97 // 0: no error | |
| 98 // 1: an error has occurred | |
| 99 // | |
| 672 | 100 int error_state = 0; |
| 101 | |
| 3489 | 102 // Current warning state. |
| 3935 | 103 // |
| 104 // Valid values: | |
| 105 // | |
| 106 // 0: no warning | |
| 107 // 1: a warning has occurred | |
| 108 // | |
| 3489 | 109 int warning_state = 0; |
| 110 | |
| 1489 | 111 // Tell the error handler whether to print messages, or just store |
| 112 // them for later. Used for handling errors in eval() and | |
| 113 // the `unwind_protect' statement. | |
| 4699 | 114 int buffer_error_messages = 0; |
| 1489 | 115 |
| 3815 | 116 // TRUE means error messages are turned off. |
| 117 bool discard_error_messages = false; | |
| 118 | |
| 4452 | 119 // TRUE means warning messages are turned off. |
| 120 bool discard_warning_messages = false; | |
| 121 | |
| 4318 | 122 void |
| 123 reset_error_handler (void) | |
| 124 { | |
| 125 error_state = 0; | |
| 126 warning_state = 0; | |
| 4699 | 127 buffer_error_messages = 0; |
| 4318 | 128 discard_error_messages = false; |
| 129 } | |
| 130 | |
| 5567 | 131 static void |
| 5794 | 132 initialize_warning_options (const std::string& state) |
| 5567 | 133 { |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
134 octave_scalar_map initw; |
| 5567 | 135 |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
136 initw.setfield ("identifier", "all"); |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
137 initw.setfield ("state", state); |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
138 |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
139 warning_options = initw; |
| 5567 | 140 } |
| 141 | |
|
10767
2b041d3995a3
modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10605
diff
changeset
|
142 static octave_map |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
143 initialize_last_error_stack (void) |
|
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
144 { |
|
10767
2b041d3995a3
modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10605
diff
changeset
|
145 return octave_call_stack::empty_backtrace (); |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
146 } |
|
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
147 |
| 3491 | 148 // Warning messages are never buffered. |
| 149 | |
| 150 static void | |
| 5567 | 151 vwarning (const char *name, const char *id, const char *fmt, va_list args) |
| 3491 | 152 { |
| 4452 | 153 if (discard_warning_messages) |
| 154 return; | |
| 155 | |
| 3491 | 156 flush_octave_stdout (); |
| 157 | |
| 5765 | 158 std::ostringstream output_buf; |
| 3491 | 159 |
| 160 if (name) | |
| 3761 | 161 output_buf << name << ": "; |
| 162 | |
| 163 octave_vformat (output_buf, fmt, args); | |
| 164 | |
| 5765 | 165 output_buf << std::endl; |
| 3491 | 166 |
| 5775 | 167 // FIXME -- we really want to capture the message before it |
| 3935 | 168 // has all the formatting goop attached to it. We probably also |
| 169 // want just the message, not the traceback information. | |
| 170 | |
| 5765 | 171 std::string msg_string = output_buf.str (); |
| 3934 | 172 |
| 3935 | 173 if (! warning_state) |
| 174 { | |
| 175 // This is the first warning in a possible series. | |
| 5567 | 176 |
| 177 Vlast_warning_id = id; | |
| 3935 | 178 Vlast_warning_message = msg_string; |
| 179 } | |
| 3934 | 180 |
| 5582 | 181 if (! Vquiet_warning) |
| 182 { | |
| 183 octave_diary << msg_string; | |
| 3935 | 184 |
| 5582 | 185 std::cerr << msg_string; |
| 186 } | |
| 3491 | 187 } |
| 188 | |
| 1 | 189 static void |
| 4732 | 190 verror (bool save_last_error, std::ostream& os, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
191 const char *name, const char *id, const char *fmt, va_list args, |
|
9753
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
192 bool with_cfn = false) |
| 1 | 193 { |
| 3815 | 194 if (discard_error_messages) |
| 195 return; | |
| 196 | |
| 3585 | 197 if (! buffer_error_messages) |
| 198 flush_octave_stdout (); | |
| 914 | 199 |
| 5775 | 200 // FIXME -- we really want to capture the message before it |
| 3935 | 201 // has all the formatting goop attached to it. We probably also |
| 202 // want just the message, not the traceback information. | |
| 203 | |
| 7877 | 204 std::ostringstream output_buf; |
| 205 | |
| 206 octave_vformat (output_buf, fmt, args); | |
| 207 | |
| 208 std::string base_msg = output_buf.str (); | |
| 209 | |
| 210 bool to_beep_or_not_to_beep_p = Vbeep_on_error && ! error_state; | |
| 211 | |
| 212 std::string msg_string; | |
| 213 | |
| 214 if (to_beep_or_not_to_beep_p) | |
| 215 msg_string = "\a"; | |
| 216 | |
| 217 if (name) | |
| 218 msg_string += std::string (name) + ": "; | |
| 219 | |
|
9753
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
220 // If with_fcn is specified, we'll attempt to prefix the message with the name |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
221 // of the current executing function. But we'll do so only if: |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
222 // 1. the name is not empty (anonymous function) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
223 // 2. it is not already there (including the following colon) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
224 if (with_cfn) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
225 { |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
226 octave_function *curfcn = octave_call_stack::current (); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
227 if (curfcn) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
228 { |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
229 std::string cfn = curfcn->name (); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
230 if (! cfn.empty ()) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
231 { |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
232 cfn += ':'; |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
233 if (cfn.length () > base_msg.length () |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
234 || base_msg.compare (0, cfn.length (), cfn) != 0) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
235 { |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
236 msg_string += cfn + ' '; |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
237 } |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
238 } |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
239 } |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
240 } |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
241 |
| 7880 | 242 msg_string += base_msg + "\n"; |
| 3935 | 243 |
| 4731 | 244 if (! error_state && save_last_error) |
| 3935 | 245 { |
| 246 // This is the first error in a possible series. | |
| 5567 | 247 |
| 248 Vlast_error_id = id; | |
| 7877 | 249 Vlast_error_message = base_msg; |
| 6361 | 250 |
| 7877 | 251 octave_user_code *fcn = octave_call_stack::caller_user_code (); |
| 6361 | 252 |
| 7877 | 253 if (fcn) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
254 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
255 octave_idx_type curr_frame = -1; |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
256 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
257 Vlast_error_stack = octave_call_stack::backtrace (0, curr_frame); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
258 } |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
259 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
260 Vlast_error_stack = initialize_last_error_stack (); |
| 3935 | 261 } |
| 262 | |
|
13987
2c0765c14e4f
eliminate unused error message buffer
John W. Eaton <jwe@octave.org>
parents:
13951
diff
changeset
|
263 if (! buffer_error_messages) |
| 1489 | 264 { |
| 3935 | 265 octave_diary << msg_string; |
| 4732 | 266 os << msg_string; |
| 1489 | 267 } |
| 1 | 268 } |
| 269 | |
| 1266 | 270 // Note that we don't actually print any message if the error string |
| 271 // is just "" or "\n". This allows error ("") and error ("\n") to | |
| 272 // just set the error state. | |
| 273 | |
| 1005 | 274 static void |
| 5567 | 275 error_1 (std::ostream& os, const char *name, const char *id, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
276 const char *fmt, va_list args, bool with_cfn = false) |
| 1005 | 277 { |
| 278 if (error_state != -2) | |
| 279 { | |
| 1489 | 280 if (fmt) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
281 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
282 if (*fmt) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
283 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
284 size_t len = strlen (fmt); |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
285 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
286 if (len > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
287 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
288 if (fmt[len - 1] == '\n') |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
289 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
290 if (len > 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
291 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
292 char *tmp_fmt = strsave (fmt); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
293 tmp_fmt[len - 1] = '\0'; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
294 verror (true, os, name, id, tmp_fmt, args, with_cfn); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
295 delete [] tmp_fmt; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
296 } |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
297 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
298 error_state = -2; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
299 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
300 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
301 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
302 verror (true, os, name, id, fmt, args, with_cfn); |
| 1423 | 303 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
304 if (! error_state) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
305 error_state = 1; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
306 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
307 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
308 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
309 } |
| 1489 | 310 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
311 panic ("error_1: invalid format"); |
| 1005 | 312 } |
| 313 } | |
| 314 | |
| 1 | 315 void |
| 6338 | 316 vmessage (const char *name, const char *fmt, va_list args) |
| 317 { | |
| 318 verror (false, std::cerr, name, "", fmt, args); | |
| 319 } | |
| 320 | |
| 321 void | |
| 1 | 322 message (const char *name, const char *fmt, ...) |
| 323 { | |
| 324 va_list args; | |
| 325 va_start (args, fmt); | |
| 6338 | 326 vmessage (name, fmt, args); |
| 1 | 327 va_end (args); |
| 328 } | |
| 329 | |
| 330 void | |
| 6338 | 331 vmessage_with_id (const char *name, const char *id, const char *fmt, |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
332 va_list args) |
| 6338 | 333 { |
| 334 verror (false, std::cerr, name, id, fmt, args); | |
| 335 } | |
| 336 | |
| 337 void | |
| 5567 | 338 message_with_id (const char *name, const char *id, const char *fmt, ...) |
| 339 { | |
| 340 va_list args; | |
| 341 va_start (args, fmt); | |
| 6338 | 342 vmessage_with_id (name, id, fmt, args); |
| 5567 | 343 va_end (args); |
| 344 } | |
| 345 | |
| 346 void | |
| 347 usage_1 (const char *id, const char *fmt, va_list args) | |
| 348 { | |
| 349 verror (true, std::cerr, "usage", id, fmt, args); | |
| 350 error_state = -1; | |
| 351 } | |
| 352 | |
| 353 void | |
| 6338 | 354 vusage (const char *fmt, va_list args) |
| 355 { | |
| 356 usage_1 ("", fmt, args); | |
| 357 } | |
| 358 | |
| 359 void | |
| 1 | 360 usage (const char *fmt, ...) |
| 361 { | |
| 362 va_list args; | |
| 363 va_start (args, fmt); | |
| 6338 | 364 vusage (fmt, args); |
| 5567 | 365 va_end (args); |
| 366 } | |
| 367 | |
| 368 void | |
| 6338 | 369 vusage_with_id (const char *id, const char *fmt, va_list args) |
| 370 { | |
| 371 usage_1 (id, fmt, args); | |
| 372 } | |
| 373 | |
| 374 void | |
| 5567 | 375 usage_with_id (const char *id, const char *fmt, ...) |
| 376 { | |
| 377 va_list args; | |
| 378 va_start (args, fmt); | |
| 6338 | 379 vusage_with_id (id, fmt, args); |
| 1 | 380 va_end (args); |
| 381 } | |
| 382 | |
| 3707 | 383 static void |
| 3719 | 384 pr_where_2 (const char *fmt, va_list args) |
| 385 { | |
| 386 if (fmt) | |
| 387 { | |
| 388 if (*fmt) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
389 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
390 size_t len = strlen (fmt); |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
391 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
392 if (len > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
393 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
394 if (fmt[len - 1] == '\n') |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
395 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
396 if (len > 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
397 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
398 char *tmp_fmt = strsave (fmt); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
399 tmp_fmt[len - 1] = '\0'; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
400 verror (false, std::cerr, 0, "", tmp_fmt, args); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
401 delete [] tmp_fmt; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
402 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
403 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
404 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
405 verror (false, std::cerr, 0, "", fmt, args); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
406 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
407 } |
| 3719 | 408 } |
| 409 else | |
| 410 panic ("pr_where_2: invalid format"); | |
| 411 } | |
| 412 | |
| 413 static void | |
| 3707 | 414 pr_where_1 (const char *fmt, ...) |
| 415 { | |
| 416 va_list args; | |
| 417 va_start (args, fmt); | |
| 3719 | 418 pr_where_2 (fmt, args); |
| 3707 | 419 va_end (args); |
| 420 } | |
| 421 | |
| 422 static void | |
| 8973 | 423 pr_where (const char *who) |
| 3707 | 424 { |
| 8973 | 425 octave_idx_type curr_frame = -1; |
| 3707 | 426 |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
427 octave_map stk = octave_call_stack::backtrace (0, curr_frame); |
| 4976 | 428 |
| 8973 | 429 octave_idx_type nframes_to_display = stk.numel (); |
| 4976 | 430 |
| 8973 | 431 if (nframes_to_display > 0) |
| 432 { | |
| 433 pr_where_1 ("%s: called from\n", who); | |
| 3708 | 434 |
| 8973 | 435 Cell names = stk.contents ("name"); |
| 436 Cell lines = stk.contents ("line"); | |
| 437 Cell columns = stk.contents ("column"); | |
| 3707 | 438 |
| 8973 | 439 for (octave_idx_type i = 0; i < nframes_to_display; i++) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
440 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
441 octave_value name = names(i); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
442 octave_value line = lines(i); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
443 octave_value column = columns(i); |
| 3707 | 444 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
445 std::string nm = name.string_value (); |
|
7552
6070c3bd69c4
Arbitrary call stack access for external debuggers changeset
ryanru@PrinceHumperdinck
parents:
7353
diff
changeset
|
446 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
447 pr_where_1 (" %s at line %d column %d\n", nm.c_str (), |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
448 line.int_value (), column.int_value ()); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
449 } |
| 3707 | 450 } |
| 451 } | |
| 452 | |
| 6000 | 453 static void |
|
9753
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
454 error_2 (const char *id, const char *fmt, va_list args, bool with_cfn = false) |
| 6000 | 455 { |
| 456 int init_state = error_state; | |
| 457 | |
|
9753
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
458 error_1 (std::cerr, "error", id, fmt, args, with_cfn); |
| 6000 | 459 |
| 460 if ((interactive || forced_interactive) | |
| 461 && Vdebug_on_error && init_state == 0 | |
|
7719
87eda1f8faaa
octave_user_code: new base class for octave_user_script and octave_user_function
John W. Eaton <jwe@octave.org>
parents:
7552
diff
changeset
|
462 && octave_call_stack::caller_user_code ()) |
| 6000 | 463 { |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9753
diff
changeset
|
464 unwind_protect frame; |
|
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9753
diff
changeset
|
465 frame.protect_var (Vdebug_on_error); |
| 6000 | 466 Vdebug_on_error = false; |
| 467 | |
| 8973 | 468 error_state = 0; |
| 6000 | 469 |
| 8973 | 470 pr_where ("error"); |
| 6000 | 471 |
| 472 do_keyboard (octave_value_list ()); | |
| 473 } | |
| 474 } | |
| 475 | |
| 476 void | |
| 6338 | 477 verror (const char *fmt, va_list args) |
| 478 { | |
| 479 error_2 ("", fmt, args); | |
| 480 } | |
| 481 | |
| 482 void | |
| 6000 | 483 error (const char *fmt, ...) |
| 484 { | |
| 485 va_list args; | |
| 486 va_start (args, fmt); | |
| 6338 | 487 verror (fmt, args); |
| 6000 | 488 va_end (args); |
| 489 } | |
| 490 | |
| 491 void | |
|
9753
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
492 verror_with_cfn (const char *fmt, va_list args) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
493 { |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
494 error_2 ("", fmt, args, true); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
495 } |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
496 |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
497 void |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
498 error_with_cfn (const char *fmt, ...) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
499 { |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
500 va_list args; |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
501 va_start (args, fmt); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
502 verror_with_cfn (fmt, args); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
503 va_end (args); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
504 } |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
505 |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
506 void |
| 6338 | 507 verror_with_id (const char *id, const char *fmt, va_list args) |
| 508 { | |
| 509 error_2 (id, fmt, args); | |
| 510 } | |
| 511 | |
| 512 void | |
| 6000 | 513 error_with_id (const char *id, const char *fmt, ...) |
| 514 { | |
| 515 va_list args; | |
| 516 va_start (args, fmt); | |
| 6338 | 517 verror_with_id (id, fmt, args); |
| 6000 | 518 va_end (args); |
| 519 } | |
| 520 | |
|
9753
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
521 void |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
522 verror_with_id_cfn (const char *id, const char *fmt, va_list args) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
523 { |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
524 error_2 (id, fmt, args, true); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
525 } |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
526 |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
527 void |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
528 error_with_id_cfn (const char *id, const char *fmt, ...) |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
529 { |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
530 va_list args; |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
531 va_start (args, fmt); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
532 verror_with_id_cfn (id, fmt, args); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
533 va_end (args); |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
534 } |
|
892e2aa7bc75
improve error messages by auto-prepending current function name
Jaroslav Hajek <highegg@gmail.com>
parents:
9675
diff
changeset
|
535 |
| 5567 | 536 static int |
| 537 check_state (const std::string& state) | |
| 538 { | |
| 539 // -1: not found | |
| 540 // 0: found, "off" | |
| 541 // 1: found, "on" | |
| 542 // 2: found, "error" | |
| 543 | |
| 544 if (state == "off") | |
| 545 return 0; | |
| 546 else if (state == "on") | |
| 547 return 1; | |
| 548 else if (state == "error") | |
| 549 return 2; | |
| 550 else | |
| 551 return -1; | |
| 552 } | |
| 553 | |
| 554 // For given warning ID, return 0 if warnings are disabled, 1 if | |
|
14042
57e19c30b7d6
assume "all" "on" if "all" is not present in warning_state structure (bug #35050)
John W. Eaton <jwe@octave.org>
parents:
13987
diff
changeset
|
555 // enabled, and 2 if the given ID should be an error instead of a |
|
57e19c30b7d6
assume "all" "on" if "all" is not present in warning_state structure (bug #35050)
John W. Eaton <jwe@octave.org>
parents:
13987
diff
changeset
|
556 // warning. |
| 5567 | 557 |
| 5781 | 558 int |
| 5567 | 559 warning_enabled (const std::string& id) |
| 1 | 560 { |
| 5567 | 561 int retval = 0; |
| 562 | |
| 563 int all_state = -1; | |
| 564 int id_state = -1; | |
| 565 | |
| 566 octave_idx_type nel = warning_options.numel (); | |
| 567 | |
| 568 if (nel > 0) | |
| 569 { | |
| 570 Cell identifier = warning_options.contents ("identifier"); | |
| 571 Cell state = warning_options.contents ("state"); | |
| 572 | |
| 573 bool all_found = false; | |
| 574 bool id_found = false; | |
| 575 | |
| 576 for (octave_idx_type i = 0; i < nel; i++) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
577 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
578 octave_value ov = identifier(i); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
579 std::string ovs = ov.string_value (); |
| 5567 | 580 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
581 if (! all_found && ovs == "all") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
582 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
583 all_state = check_state (state(i).string_value ()); |
| 5567 | 584 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
585 if (all_state >= 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
586 all_found = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
587 } |
| 5567 | 588 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
589 if (! id_found && ovs == id) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
590 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
591 id_state = check_state (state(i).string_value ()); |
| 5567 | 592 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
593 if (id_state >= 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
594 id_found = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
595 } |
| 5567 | 596 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
597 if (all_found && id_found) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
598 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
599 } |
| 5567 | 600 } |
| 601 | |
|
14042
57e19c30b7d6
assume "all" "on" if "all" is not present in warning_state structure (bug #35050)
John W. Eaton <jwe@octave.org>
parents:
13987
diff
changeset
|
602 // If "all" is not present, assume warnings are enabled. |
| 5567 | 603 if (all_state == -1) |
|
14042
57e19c30b7d6
assume "all" "on" if "all" is not present in warning_state structure (bug #35050)
John W. Eaton <jwe@octave.org>
parents:
13987
diff
changeset
|
604 all_state = 1; |
| 5567 | 605 |
| 606 if (all_state == 0) | |
| 607 { | |
| 608 if (id_state >= 0) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
609 retval = id_state; |
| 5567 | 610 } |
| 611 else if (all_state == 1) | |
| 612 { | |
| 613 if (id_state == 0 || id_state == 2) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
614 retval = id_state; |
| 5567 | 615 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
616 retval = all_state; |
| 5567 | 617 } |
| 618 else if (all_state == 2) | |
| 7206 | 619 { |
| 620 if (id_state == 0) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
621 retval= id_state; |
| 7206 | 622 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
623 retval = all_state; |
| 7206 | 624 } |
| 5567 | 625 |
| 626 return retval; | |
| 627 } | |
| 628 | |
| 629 static void | |
| 630 warning_1 (const char *id, const char *fmt, va_list args) | |
| 631 { | |
| 632 int warn_opt = warning_enabled (id); | |
| 633 | |
| 634 if (warn_opt == 2) | |
| 635 { | |
| 636 // Handle this warning as an error. | |
| 637 | |
| 5998 | 638 error_2 (id, fmt, args); |
| 5567 | 639 } |
| 640 else if (warn_opt == 1) | |
| 3934 | 641 { |
| 8973 | 642 vwarning ("warning", id, fmt, args); |
| 643 | |
| 644 if (! symbol_table::at_top_level () | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
645 && Vbacktrace_on_warning |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
646 && ! warning_state |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
647 && ! discard_warning_messages) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
648 pr_where ("warning"); |
| 3707 | 649 |
| 3935 | 650 warning_state = 1; |
| 651 | |
| 3934 | 652 if ((interactive || forced_interactive) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
653 && Vdebug_on_warning |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
654 && octave_call_stack::caller_user_code ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
655 { |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9753
diff
changeset
|
656 unwind_protect frame; |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
657 frame.protect_var (Vdebug_on_warning); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
658 Vdebug_on_warning = false; |
| 3707 | 659 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
660 do_keyboard (octave_value_list ()); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
661 } |
| 3707 | 662 } |
| 1 | 663 } |
| 664 | |
| 665 void | |
| 6338 | 666 vwarning (const char *fmt, va_list args) |
| 667 { | |
| 668 warning_1 ("", fmt, args); | |
| 669 } | |
| 670 | |
| 671 void | |
| 5567 | 672 warning (const char *fmt, ...) |
| 673 { | |
| 674 va_list args; | |
| 675 va_start (args, fmt); | |
| 6338 | 676 vwarning (fmt, args); |
| 5567 | 677 va_end (args); |
| 678 } | |
| 679 | |
| 680 void | |
| 6338 | 681 vwarning_with_id (const char *id, const char *fmt, va_list args) |
| 682 { | |
| 683 warning_1 (id, fmt, args); | |
| 684 } | |
| 685 | |
| 686 void | |
| 5567 | 687 warning_with_id (const char *id, const char *fmt, ...) |
| 688 { | |
| 689 va_list args; | |
| 690 va_start (args, fmt); | |
| 6338 | 691 vwarning_with_id (id, fmt, args); |
| 5567 | 692 va_end (args); |
| 693 } | |
| 694 | |
| 695 void | |
| 6338 | 696 vparse_error (const char *fmt, va_list args) |
| 697 { | |
| 698 error_1 (std::cerr, 0, "", fmt, args); | |
| 699 } | |
| 700 | |
| 701 void | |
| 1005 | 702 parse_error (const char *fmt, ...) |
| 703 { | |
| 704 va_list args; | |
| 705 va_start (args, fmt); | |
| 6338 | 706 vparse_error (fmt, args); |
| 5567 | 707 va_end (args); |
| 708 } | |
| 709 | |
| 710 void | |
| 6338 | 711 vparse_error_with_id (const char *id, const char *fmt, va_list args) |
| 712 { | |
| 713 error_1 (std::cerr, 0, id, fmt, args); | |
| 714 } | |
| 715 | |
| 716 void | |
| 5567 | 717 parse_error_with_id (const char *id, const char *fmt, ...) |
| 718 { | |
| 719 va_list args; | |
| 720 va_start (args, fmt); | |
| 6338 | 721 vparse_error_with_id (id, fmt, args); |
| 1 | 722 va_end (args); |
| 723 } | |
| 724 | |
| 189 | 725 void |
| 6361 | 726 rethrow_error (const char *id, const char *fmt, ...) |
| 727 { | |
| 728 va_list args; | |
| 729 va_start (args, fmt); | |
| 6640 | 730 error_1 (std::cerr, 0, id, fmt, args); |
| 6361 | 731 va_end (args); |
| 732 } | |
| 733 | |
| 734 void | |
| 1 | 735 panic (const char *fmt, ...) |
| 736 { | |
| 737 va_list args; | |
| 738 va_start (args, fmt); | |
| 4699 | 739 buffer_error_messages = 0; |
| 3815 | 740 discard_error_messages = false; |
| 5567 | 741 verror (false, std::cerr, "panic", "", fmt, args); |
| 1 | 742 va_end (args); |
| 743 abort (); | |
| 744 } | |
| 745 | |
| 4732 | 746 static void |
| 747 defun_usage_message_1 (const char *fmt, ...) | |
| 748 { | |
| 749 va_list args; | |
| 750 va_start (args, fmt); | |
| 5567 | 751 error_1 (octave_stdout, 0, "", fmt, args); |
| 4732 | 752 va_end (args); |
| 753 } | |
| 754 | |
| 755 void | |
| 756 defun_usage_message (const std::string& msg) | |
| 757 { | |
| 758 defun_usage_message_1 ("%s", msg.c_str ()); | |
| 759 } | |
| 760 | |
| 5567 | 761 typedef void (*error_fun)(const char *, const char *, ...); |
| 1489 | 762 |
| 2086 | 763 extern octave_value_list Fsprintf (const octave_value_list&, int); |
| 1489 | 764 |
| 3934 | 765 static std::string |
| 5567 | 766 handle_message (error_fun f, const char *id, const char *msg, |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
767 const octave_value_list& args, bool have_fmt) |
| 528 | 768 { |
| 3934 | 769 std::string retval; |
| 528 | 770 |
| 3523 | 771 std::string tstr; |
| 1728 | 772 |
| 528 | 773 int nargin = args.length (); |
| 774 | |
| 2745 | 775 if (nargin > 0) |
| 528 | 776 { |
| 3066 | 777 octave_value arg; |
| 778 | |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
779 if (have_fmt) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
780 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
781 octave_value_list tmp = Fsprintf (args, 1); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
782 arg = tmp(0); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
783 } |
| 3066 | 784 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
785 arg = args(0); |
| 2745 | 786 |
| 787 if (arg.is_defined ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
788 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
789 if (arg.is_string ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
790 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
791 tstr = arg.string_value (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
792 msg = tstr.c_str (); |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
793 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
794 if (! msg) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
795 return retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
796 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
797 else if (arg.is_empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
798 return retval; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
799 } |
| 528 | 800 } |
| 801 | |
| 1489 | 802 // Ugh. |
| 803 | |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
804 size_t len = strlen (msg); |
|
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
805 |
|
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
806 if (len > 0) |
| 1489 | 807 { |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
808 if (msg[len - 1] == '\n') |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
809 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
810 if (len > 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
811 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
812 char *tmp_msg = strsave (msg); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
813 tmp_msg[len - 1] = '\0'; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
814 f (id, "%s\n", tmp_msg); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
815 retval = tmp_msg; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
816 delete [] tmp_msg; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
817 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
818 } |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
819 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
820 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
821 f (id, "%s", msg); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
822 retval = msg; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
823 } |
| 3934 | 824 } |
| 528 | 825 |
| 826 return retval; | |
| 827 } | |
| 828 | |
| 6361 | 829 DEFUN (rethrow, args, , |
| 830 "-*- texinfo -*-\n\ | |
| 831 @deftypefn {Built-in Function} {} rethrow (@var{err})\n\ | |
|
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
832 Reissue a previous error as defined by @var{err}. @var{err} is a structure\n\ |
|
9039
51dc9691f23f
Cleanup documentation files errors.texi, debug.texi, io.texi
Rik <rdrider0-list@yahoo.com>
parents:
8973
diff
changeset
|
833 that must contain at least the 'message' and 'identifier' fields. @var{err}\n\ |
| 6361 | 834 can also contain a field 'stack' that gives information on the assumed\n\ |
|
9039
51dc9691f23f
Cleanup documentation files errors.texi, debug.texi, io.texi
Rik <rdrider0-list@yahoo.com>
parents:
8973
diff
changeset
|
835 location of the error. Typically @var{err} is returned from\n\ |
| 6361 | 836 @code{lasterror}.\n\ |
| 837 @seealso{lasterror, lasterr, error}\n\ | |
| 838 @end deftypefn") | |
| 839 { | |
| 840 octave_value retval; | |
| 841 int nargin = args.length(); | |
| 842 | |
| 843 if (nargin != 1) | |
| 6959 | 844 print_usage (); |
| 6361 | 845 else |
| 846 { | |
|
10767
2b041d3995a3
modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10605
diff
changeset
|
847 const octave_scalar_map err = args(0).scalar_map_value (); |
| 6361 | 848 |
| 6483 | 849 if (! error_state) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
850 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
851 if (err.contains ("message") && err.contains ("identifier")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
852 { |
|
10767
2b041d3995a3
modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10605
diff
changeset
|
853 std::string msg = err.contents("message").string_value (); |
|
2b041d3995a3
modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10605
diff
changeset
|
854 std::string id = err.contents("identifier").string_value (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
855 int len = msg.length(); |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
856 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
857 std::string file; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
858 std::string nm; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
859 int l = -1; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
860 int c = -1; |
| 6361 | 861 |
|
10767
2b041d3995a3
modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10605
diff
changeset
|
862 octave_map err_stack = initialize_last_error_stack (); |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
863 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
864 if (err.contains ("stack")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
865 { |
|
10767
2b041d3995a3
modernize some map usage on toplev.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
10605
diff
changeset
|
866 err_stack = err.contents("stack").map_value (); |
| 6483 | 867 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
868 if (err_stack.numel () > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
869 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
870 if (err_stack.contains ("file")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
871 file = err_stack.contents("file")(0).string_value (); |
| 6483 | 872 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
873 if (err_stack.contains ("name")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
874 nm = err_stack.contents("name")(0).string_value (); |
| 6483 | 875 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
876 if (err_stack.contains ("line")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
877 l = err_stack.contents("line")(0).nint_value (); |
| 6640 | 878 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
879 if (err_stack.contains ("column")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
880 c = err_stack.contents("column")(0).nint_value (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
881 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
882 } |
| 6361 | 883 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
884 // Ugh. |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
885 char *tmp_msg = strsave (msg.c_str ()); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
886 if (tmp_msg[len-1] == '\n') |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
887 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
888 if (len > 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
889 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
890 tmp_msg[len - 1] = '\0'; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
891 rethrow_error (id.c_str (), "%s\n", tmp_msg); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
892 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
893 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
894 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
895 rethrow_error (id.c_str (), "%s", tmp_msg); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
896 delete [] tmp_msg; |
| 6361 | 897 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
898 // FIXME -- is this the right thing to do for |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
899 // Vlast_error_stack? Should it be saved and restored |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
900 // with unwind_protect? |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
901 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
902 Vlast_error_stack = err_stack; |
| 6361 | 903 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
904 if (err.contains ("stack")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
905 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
906 if (file.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
907 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
908 if (nm.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
909 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
910 if (l > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
911 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
912 if (c > 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
913 pr_where_1 ("error: near line %d, column %d", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
914 l, c); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
915 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
916 pr_where_1 ("error: near line %d", l); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
917 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
918 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
919 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
920 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
921 if (l > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
922 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
923 if (c > 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
924 pr_where_1 ("error: called from `%s' near line %d, column %d", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
925 nm.c_str (), l, c); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
926 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
927 pr_where_1 ("error: called from `%d' near line %d", nm.c_str (), l); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
928 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
929 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
930 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
931 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
932 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
933 if (nm.empty ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
934 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
935 if (l > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
936 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
937 if (c > 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
938 pr_where_1 ("error: in file %s near line %d, column %d", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
939 file.c_str (), l, c); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
940 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
941 pr_where_1 ("error: in file %s near line %d", file.c_str (), l); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
942 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
943 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
944 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
945 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
946 if (l > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
947 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
948 if (c > 0) |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
949 pr_where_1 ("error: called from `%s' in file %s near line %d, column %d", |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
950 nm.c_str (), file.c_str (), l, c); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
951 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
952 pr_where_1 ("error: called from `%d' in file %s near line %d", nm.c_str (), file.c_str (), l); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
953 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
954 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
955 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
956 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
957 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
958 else |
|
12483
7a5aacf65f81
Rewrite error strings in src/ to use variables named in documentation.
Rik <octave@nomad.inbox5.com>
parents:
11586
diff
changeset
|
959 error ("rethrow: ERR structure must contain the fields 'message and 'identifier'"); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
960 } |
| 6361 | 961 } |
| 962 return retval; | |
| 963 } | |
| 964 | |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
965 // Determine whether the first argument to error or warning function |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
966 // should be handled as the message identifier or as the format string. |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
967 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
968 static bool |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
969 maybe_extract_message_id (const std::string& caller, |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
970 const octave_value_list& args, |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
971 octave_value_list& nargs, |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
972 std::string& id) |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
973 { |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
974 nargs = args; |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
975 id = std::string (); |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
976 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
977 int nargin = args.length (); |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
978 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
979 bool have_fmt = nargin > 1; |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
980 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
981 if (nargin > 0) |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
982 { |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
983 std::string arg1 = args(0).string_value (); |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
984 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
985 if (! error_state) |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
986 { |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
987 // For compatibility with Matlab, an identifier must contain |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
988 // ':', but not at the beginning or the end, and it must not |
|
14559
90c51d8797cc
also require that warning and error message identifiers do not contain whitespace
John W. Eaton <jwe@octave.org>
parents:
14558
diff
changeset
|
989 // contain '%' (even if it is not a valid conversion |
|
90c51d8797cc
also require that warning and error message identifiers do not contain whitespace
John W. Eaton <jwe@octave.org>
parents:
14558
diff
changeset
|
990 // operator) or whitespace. |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
991 |
|
14559
90c51d8797cc
also require that warning and error message identifiers do not contain whitespace
John W. Eaton <jwe@octave.org>
parents:
14558
diff
changeset
|
992 if (arg1.find_first_of ("% \f\n\r\t\v") == std::string::npos |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
993 && arg1.find (':') != std::string::npos |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
994 && arg1[0] != ':' |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
995 && arg1[arg1.length()-1] != ':') |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
996 { |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
997 if (nargin > 1) |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
998 { |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
999 id = arg1; |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1000 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1001 nargs.resize (nargin-1); |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1002 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1003 for (int i = 1; i < nargin; i++) |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1004 nargs(i-1) = args(i); |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1005 } |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1006 else |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1007 nargs(0) = "call to " + caller |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1008 + " with message identifier requires message"; |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1009 } |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1010 } |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1011 } |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1012 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1013 return have_fmt; |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1014 } |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1015 |
| 1957 | 1016 DEFUN (error, args, , |
| 3373 | 1017 "-*- texinfo -*-\n\ |
| 10840 | 1018 @deftypefn {Built-in Function} {} error (@var{template}, @dots{})\n\ |
| 7252 | 1019 @deftypefnx {Built-in Function} {} error (@var{id}, @var{template}, @dots{})\n\ |
| 5781 | 1020 Format the optional arguments under the control of the template string\n\ |
| 1021 @var{template} using the same rules as the @code{printf} family of\n\ | |
| 1022 functions (@pxref{Formatted Output}) and print the resulting message\n\ | |
| 1023 on the @code{stderr} stream. The message is prefixed by the character\n\ | |
| 1024 string @samp{error: }.\n\ | |
| 3373 | 1025 \n\ |
| 1026 Calling @code{error} also sets Octave's internal error state such that\n\ | |
| 1027 control will return to the top level without evaluating any more\n\ | |
| 1028 commands. This is useful for aborting from functions or scripts.\n\ | |
| 897 | 1029 \n\ |
| 3373 | 1030 If the error message does not end with a new line character, Octave will\n\ |
| 1031 print a traceback of all the function calls leading to the error. For\n\ | |
| 1032 example, given the following function definitions:\n\ | |
| 1033 \n\ | |
| 1034 @example\n\ | |
| 1035 @group\n\ | |
| 6671 | 1036 function f () g (); end\n\ |
| 1037 function g () h (); end\n\ | |
| 3373 | 1038 function h () nargin == 1 || error (\"nargin != 1\"); end\n\ |
| 1039 @end group\n\ | |
| 1040 @end example\n\ | |
| 1489 | 1041 \n\ |
| 3373 | 1042 @noindent\n\ |
| 1043 calling the function @code{f} will result in a list of messages that\n\ | |
| 1044 can help you to quickly locate the exact location of the error:\n\ | |
| 1489 | 1045 \n\ |
|
9153
5247e89688e1
Eliminate most overfull errors when running texi2pdf for generating pdf documentation
Rik <rdrider0-list@yahoo.com>
parents:
9039
diff
changeset
|
1046 @example\n\ |
| 3373 | 1047 @group\n\ |
| 1048 f ()\n\ | |
| 1049 error: nargin != 1\n\ | |
|
8015
30629059b72d
Update the manual to reflect the changes in error output
sh@sh-laptop
parents:
7977
diff
changeset
|
1050 error: called from:\n\ |
|
30629059b72d
Update the manual to reflect the changes in error output
sh@sh-laptop
parents:
7977
diff
changeset
|
1051 error: error at line -1, column -1\n\ |
|
30629059b72d
Update the manual to reflect the changes in error output
sh@sh-laptop
parents:
7977
diff
changeset
|
1052 error: h at line 1, column 27\n\ |
|
30629059b72d
Update the manual to reflect the changes in error output
sh@sh-laptop
parents:
7977
diff
changeset
|
1053 error: g at line 1, column 15\n\ |
|
30629059b72d
Update the manual to reflect the changes in error output
sh@sh-laptop
parents:
7977
diff
changeset
|
1054 error: f at line 1, column 15\n\ |
| 3373 | 1055 @end group\n\ |
|
9153
5247e89688e1
Eliminate most overfull errors when running texi2pdf for generating pdf documentation
Rik <rdrider0-list@yahoo.com>
parents:
9039
diff
changeset
|
1056 @end example\n\ |
| 3373 | 1057 \n\ |
| 1058 If the error message ends in a new line character, Octave will print the\n\ | |
| 1059 message but will not display any traceback messages as it returns\n\ | |
| 1060 control to the top level. For example, modifying the error message\n\ | |
| 1061 in the previous example to end in a new line causes Octave to only print\n\ | |
| 1062 a single message:\n\ | |
| 1063 \n\ | |
| 1064 @example\n\ | |
| 1065 @group\n\ | |
| 1066 function h () nargin == 1 || error (\"nargin != 1\\n\"); end\n\ | |
| 1067 f ()\n\ | |
| 1068 error: nargin != 1\n\ | |
| 1069 @end group\n\ | |
| 1070 @end example\n\ | |
| 1071 @end deftypefn") | |
| 897 | 1072 { |
| 7252 | 1073 octave_value retval; |
| 1074 | |
| 1075 int nargin = args.length (); | |
| 1076 | |
| 1077 octave_value_list nargs = args; | |
| 1078 | |
| 1079 std::string id; | |
| 1080 | |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
1081 if (nargin == 0) |
|
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
1082 print_usage (); |
|
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
1083 else |
| 7252 | 1084 { |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1085 bool have_fmt = false; |
| 5567 | 1086 |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1087 if (nargin == 1 && args(0).is_map ()) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1088 { |
|
13709
a0875c6cab7e
error.cc: Don't complain if error struct input is empty (Matlab compatability)
Rik <octave@nomad.inbox5.com>
parents:
12705
diff
changeset
|
1089 // empty struct is not an error. return and resume calling function. |
|
a0875c6cab7e
error.cc: Don't complain if error struct input is empty (Matlab compatability)
Rik <octave@nomad.inbox5.com>
parents:
12705
diff
changeset
|
1090 if (args(0).is_empty ()) |
|
a0875c6cab7e
error.cc: Don't complain if error struct input is empty (Matlab compatability)
Rik <octave@nomad.inbox5.com>
parents:
12705
diff
changeset
|
1091 return retval; |
|
a0875c6cab7e
error.cc: Don't complain if error struct input is empty (Matlab compatability)
Rik <octave@nomad.inbox5.com>
parents:
12705
diff
changeset
|
1092 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1093 octave_value_list tmp; |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
1094 |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1095 octave_scalar_map m = args(0).scalar_map_value (); |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
1096 |
|
12705
4972eb61c6d6
Fix bug with error() not accepting an empty struct input (Bug #33428).
Rik <octave@nomad.inbox5.com>
parents:
12704
diff
changeset
|
1097 // empty struct is not an error. return and resume calling function. |
|
4972eb61c6d6
Fix bug with error() not accepting an empty struct input (Bug #33428).
Rik <octave@nomad.inbox5.com>
parents:
12704
diff
changeset
|
1098 if (m.nfields () == 0) |
|
4972eb61c6d6
Fix bug with error() not accepting an empty struct input (Bug #33428).
Rik <octave@nomad.inbox5.com>
parents:
12704
diff
changeset
|
1099 return retval; |
|
4972eb61c6d6
Fix bug with error() not accepting an empty struct input (Bug #33428).
Rik <octave@nomad.inbox5.com>
parents:
12704
diff
changeset
|
1100 |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1101 if (m.contains ("message")) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1102 { |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1103 octave_value c = m.getfield ("message"); |
| 7252 | 1104 |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1105 if (c.is_string ()) |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1106 nargs(0) = c.string_value (); |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1107 } |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
1108 |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1109 if (m.contains ("identifier")) |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1110 { |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1111 octave_value c = m.getfield ("identifier"); |
| 7252 | 1112 |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1113 if (c.is_string ()) |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1114 id = c.string_value (); |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1115 } |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
1116 |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1117 // FIXME -- also need to handle "stack" field in error |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1118 // structure, but that will require some more significant |
|
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1119 // surgery on handle_message, error_with_id, etc. |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1120 } |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1121 else |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1122 { |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1123 have_fmt = maybe_extract_message_id ("error", args, nargs, id); |
|
9675
ef45d191d833
error: improve compatibility for calls with no arguments or empty format
John W. Eaton <jwe@octave.org>
parents:
9588
diff
changeset
|
1124 |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1125 if (error_state) |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1126 return retval; |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1127 } |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1128 |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1129 handle_message (error_with_id, id.c_str (), "unspecified error", |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1130 nargs, have_fmt); |
| 7252 | 1131 } |
| 1132 | |
| 3934 | 1133 return retval; |
| 1489 | 1134 } |
| 897 | 1135 |
|
8746
5dd06f19e9be
handle commands in the lexer
John W. Eaton <jwe@octave.org>
parents:
8347
diff
changeset
|
1136 DEFUN (warning, args, nargout, |
| 3373 | 1137 "-*- texinfo -*-\n\ |
| 10840 | 1138 @deftypefn {Built-in Function} {} warning (@var{template}, @dots{})\n\ |
| 7252 | 1139 @deftypefnx {Built-in Function} {} warning (@var{id}, @var{template}, @dots{})\n\ |
|
14072
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1140 @deftypefnx {Built-in Function} {} warning (\"on\", @var{id})\n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1141 @deftypefnx {Built-in Function} {} warning (\"off\", @var{id})\n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1142 @deftypefnx {Built-in Function} {} warning (\"query\", @var{id})\n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1143 @deftypefnx {Built-in Function} {} warning (\"error\", @var{id})\n\ |
| 5781 | 1144 Format the optional arguments under the control of the template string\n\ |
| 1145 @var{template} using the same rules as the @code{printf} family of\n\ | |
| 1146 functions (@pxref{Formatted Output}) and print the resulting message\n\ | |
| 1147 on the @code{stderr} stream. The message is prefixed by the character\n\ | |
| 1148 string @samp{warning: }.\n\ | |
| 1149 You should use this function when you want to notify the user\n\ | |
| 3600 | 1150 of an unusual condition, but only when it makes sense for your program\n\ |
| 1151 to go on.\n\ | |
| 5781 | 1152 \n\ |
| 1153 The optional message identifier allows users to enable or disable\n\ | |
| 1154 warnings tagged by @var{id}. The special identifier @samp{\"all\"} may\n\ | |
| 1155 be used to set the state of all warnings.\n\ | |
| 1156 \n\ | |
|
14072
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1157 If the first argument is @samp{\"on\"} or @samp{\"off\"}, set the state\n\ |
|
14093
050bc580cb60
doc: Various docstring improvements before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents:
14072
diff
changeset
|
1158 of a particular warning using the identifier @var{id}. If the first\n\ |
|
14072
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1159 argument is @samp{\"query\"}, query the state of this warning instead.\n\ |
|
14093
050bc580cb60
doc: Various docstring improvements before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents:
14072
diff
changeset
|
1160 If the identifier is omitted, a value of @samp{\"all\"} is assumed. If\n\ |
|
14072
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1161 you set the state of a warning to @samp{\"error\"}, the warning named by\n\ |
|
14093
050bc580cb60
doc: Various docstring improvements before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents:
14072
diff
changeset
|
1162 @var{id} is handled as if it were an error instead. So, for example, the\n\ |
|
14072
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1163 following handles all warnings as errors:\n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1164 \n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1165 @example\n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1166 @group\n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1167 warning (\"error\");\n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1168 @end group\n\ |
|
d0d9c5d2e434
doc: Reformat and clarify warning's docstring
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
14055
diff
changeset
|
1169 @end example\n\ |
| 5783 | 1170 @seealso{warning_ids}\n\ |
| 3373 | 1171 @end deftypefn") |
| 1489 | 1172 { |
| 5567 | 1173 octave_value retval; |
| 3934 | 1174 |
| 5567 | 1175 int nargin = args.length (); |
| 1176 int argc = nargin + 1; | |
| 3934 | 1177 |
| 3935 | 1178 bool done = false; |
| 3934 | 1179 |
| 5567 | 1180 if (argc > 1 && args.all_strings_p ()) |
| 3935 | 1181 { |
| 1182 string_vector argv = args.make_argv ("warning"); | |
| 1183 | |
| 1184 if (! error_state) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1185 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1186 std::string arg1 = argv(1); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1187 std::string arg2 = "all"; |
| 5567 | 1188 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1189 if (argc == 3) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1190 arg2 = argv(2); |
| 5567 | 1191 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1192 if (arg1 == "on" || arg1 == "off" || arg1 == "error") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1193 { |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1194 octave_map old_warning_options = warning_options; |
| 5567 | 1195 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1196 if (arg2 == "all") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1197 { |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1198 octave_map tmp; |
| 3934 | 1199 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1200 Cell id (1, 1); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1201 Cell st (1, 1); |
| 7202 | 1202 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1203 id(0) = arg2; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1204 st(0) = arg1; |
| 7202 | 1205 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1206 // Since internal Octave functions are not |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1207 // compatible, turning all warnings into errors |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1208 // should leave the state of |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1209 // Octave:matlab-incompatible alone. |
| 7202 | 1210 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1211 if (arg1 == "error" |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1212 && warning_options.contains ("identifier")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1213 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1214 octave_idx_type n = 1; |
| 7206 | 1215 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1216 Cell tid = warning_options.contents ("identifier"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1217 Cell tst = warning_options.contents ("state"); |
| 7202 | 1218 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1219 for (octave_idx_type i = 0; i < tid.numel (); i++) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1220 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1221 octave_value vid = tid(i); |
| 7202 | 1222 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1223 if (vid.is_string ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1224 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1225 std::string key = vid.string_value (); |
| 7202 | 1226 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1227 if (key == "Octave:matlab-incompatible" |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1228 || key == "Octave:single-quote-string") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1229 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1230 id.resize (dim_vector (1, n+1)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1231 st.resize (dim_vector (1, n+1)); |
| 7202 | 1232 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1233 id(n) = tid(i); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1234 st(n) = tst(i); |
| 7206 | 1235 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1236 n++; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1237 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1238 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1239 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1240 } |
| 7202 | 1241 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1242 tmp.assign ("identifier", id); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1243 tmp.assign ("state", st); |
| 5567 | 1244 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1245 warning_options = tmp; |
| 5567 | 1246 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1247 done = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1248 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1249 else if (arg2 == "backtrace") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1250 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1251 if (arg1 != "error") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1252 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1253 Vbacktrace_on_warning = (arg1 == "on"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1254 done = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1255 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1256 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1257 else if (arg2 == "debug") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1258 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1259 if (arg1 != "error") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1260 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1261 Vdebug_on_warning = (arg1 == "on"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1262 done = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1263 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1264 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1265 else if (arg2 == "verbose") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1266 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1267 if (arg1 != "error") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1268 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1269 Vverbose_warning = (arg1 == "on"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1270 done = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1271 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1272 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1273 else if (arg2 == "quiet") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1274 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1275 if (arg1 != "error") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1276 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1277 Vquiet_warning = (arg1 == "on"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1278 done = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1279 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1280 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1281 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1282 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1283 if (arg2 == "last") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1284 arg2 = Vlast_warning_id; |
| 5567 | 1285 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1286 if (arg2 == "all") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1287 initialize_warning_options (arg1); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1288 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1289 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1290 Cell ident = warning_options.contents ("identifier"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1291 Cell state = warning_options.contents ("state"); |
| 5567 | 1292 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1293 octave_idx_type nel = ident.numel (); |
| 5567 | 1294 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1295 bool found = false; |
| 5567 | 1296 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1297 for (octave_idx_type i = 0; i < nel; i++) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1298 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1299 if (ident(i).string_value () == arg2) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1300 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1301 // FIXME -- if state for "all" is |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1302 // same as arg1, we can simply remove the |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1303 // item from the list. |
| 5567 | 1304 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1305 state(i) = arg1; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1306 warning_options.assign ("state", state); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1307 found = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1308 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1309 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1310 } |
| 5567 | 1311 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1312 if (! found) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1313 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1314 // FIXME -- if state for "all" is |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1315 // same as arg1, we don't need to do anything. |
| 5567 | 1316 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1317 ident.resize (dim_vector (1, nel+1)); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1318 state.resize (dim_vector (1, nel+1)); |
| 5567 | 1319 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1320 ident(nel) = arg2; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1321 state(nel) = arg1; |
| 5567 | 1322 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1323 warning_options.clear (); |
| 5567 | 1324 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1325 warning_options.assign ("identifier", ident); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1326 warning_options.assign ("state", state); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1327 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1328 } |
| 5567 | 1329 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1330 done = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1331 } |
| 5567 | 1332 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1333 if (done && nargout > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1334 retval = old_warning_options; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1335 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1336 else if (arg1 == "query") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1337 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1338 if (arg2 == "all") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1339 retval = warning_options; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1340 else if (arg2 == "backtrace" || arg2 == "debug" |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1341 || arg2 == "verbose" || arg2 == "quiet") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1342 { |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1343 octave_scalar_map tmp; |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1344 tmp.assign ("identifier", arg2); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1345 if (arg2 == "backtrace") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1346 tmp.assign ("state", Vbacktrace_on_warning ? "on" : "off"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1347 else if (arg2 == "debug") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1348 tmp.assign ("state", Vdebug_on_warning ? "on" : "off"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1349 else if (arg2 == "verbose") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1350 tmp.assign ("state", Vverbose_warning ? "on" : "off"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1351 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1352 tmp.assign ("state", Vquiet_warning ? "on" : "off"); |
| 5582 | 1353 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1354 retval = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1355 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1356 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1357 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1358 if (arg2 == "last") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1359 arg2 = Vlast_warning_id; |
| 5567 | 1360 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1361 Cell ident = warning_options.contents ("identifier"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1362 Cell state = warning_options.contents ("state"); |
| 5567 | 1363 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1364 octave_idx_type nel = ident.numel (); |
| 5567 | 1365 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1366 bool found = false; |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1367 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1368 std::string val; |
| 5567 | 1369 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1370 for (octave_idx_type i = 0; i < nel; i++) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1371 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1372 if (ident(i).string_value () == arg2) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1373 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1374 val = state(i).string_value (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1375 found = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1376 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1377 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1378 } |
| 5567 | 1379 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1380 if (! found) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1381 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1382 for (octave_idx_type i = 0; i < nel; i++) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1383 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1384 if (ident(i).string_value () == "all") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1385 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1386 val = state(i).string_value (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1387 found = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1388 break; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1389 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1390 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1391 } |
| 5781 | 1392 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1393 if (found) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1394 { |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1395 octave_scalar_map tmp; |
| 5567 | 1396 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1397 tmp.assign ("identifier", arg2); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1398 tmp.assign ("state", val); |
| 5567 | 1399 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1400 retval = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1401 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1402 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1403 error ("warning: unable to find default warning state!"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1404 } |
| 5567 | 1405 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1406 done = true; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1407 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1408 } |
| 3934 | 1409 } |
| 5567 | 1410 else if (argc == 1) |
| 1411 { | |
| 1412 retval = warning_options; | |
| 3934 | 1413 |
| 5567 | 1414 done = true; |
| 1415 } | |
| 1416 else if (argc == 2) | |
| 1417 { | |
| 1418 octave_value arg = args(0); | |
| 1419 | |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1420 octave_map old_warning_options = warning_options; |
| 5567 | 1421 |
| 1422 if (arg.is_map ()) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1423 { |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1424 octave_map m = arg.map_value (); |
| 5567 | 1425 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1426 if (m.contains ("identifier") && m.contains ("state")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1427 warning_options = m; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1428 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1429 error ("warning: expecting structure with fields `identifier' and `state'"); |
| 5567 | 1430 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1431 done = true; |
| 5567 | 1432 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1433 if (nargout > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1434 retval = old_warning_options; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1435 } |
| 5567 | 1436 } |
| 1437 | |
| 1438 if (! (error_state || done)) | |
| 3935 | 1439 { |
| 5567 | 1440 octave_value_list nargs = args; |
| 1441 | |
| 1442 std::string id; | |
| 1443 | |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1444 bool have_fmt = maybe_extract_message_id ("warning", args, nargs, id); |
| 5567 | 1445 |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1446 if (error_state) |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1447 return retval; |
| 5567 | 1448 |
| 3935 | 1449 std::string prev_msg = Vlast_warning_message; |
| 1450 | |
| 5567 | 1451 std::string curr_msg = handle_message (warning_with_id, id.c_str (), |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1452 "unspecified warning", nargs, |
|
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1453 have_fmt); |
| 3935 | 1454 |
| 1455 if (nargout > 0) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1456 retval = prev_msg; |
| 3935 | 1457 } |
| 1458 | |
| 3934 | 1459 return retval; |
| 1460 } | |
| 1461 | |
|
10605
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1462 octave_value_list |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1463 set_warning_state (const std::string& id, const std::string& state) |
| 5794 | 1464 { |
| 1465 octave_value_list args; | |
| 1466 | |
| 1467 args(1) = id; | |
|
10605
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1468 args(0) = state; |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1469 |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1470 return Fwarning (args, 1); |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1471 } |
| 5794 | 1472 |
|
10605
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1473 octave_value_list |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1474 set_warning_state (const octave_value_list& args) |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1475 { |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1476 return Fwarning (args, 1); |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1477 } |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1478 |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1479 void |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1480 disable_warning (const std::string& id) |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1481 { |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1482 set_warning_state (id, "off"); |
| 5794 | 1483 } |
| 1484 | |
| 1485 void | |
| 1486 initialize_default_warning_state (void) | |
| 1487 { | |
| 1488 initialize_warning_options ("on"); | |
| 1489 | |
| 1490 // Most people will want to have the following disabled. | |
| 1491 | |
| 1492 disable_warning ("Octave:array-to-scalar"); | |
| 1493 disable_warning ("Octave:array-to-vector"); | |
| 1494 disable_warning ("Octave:imag-to-real"); | |
| 1495 disable_warning ("Octave:matlab-incompatible"); | |
| 1496 disable_warning ("Octave:missing-semicolon"); | |
| 1497 disable_warning ("Octave:neg-dim-as-zero"); | |
| 1498 disable_warning ("Octave:resize-on-range-error"); | |
| 1499 disable_warning ("Octave:separator-insert"); | |
| 1500 disable_warning ("Octave:single-quote-string"); | |
| 1501 disable_warning ("Octave:str-to-num"); | |
|
13841
0a158dbdb04a
Remove 3 unused warning ids
Rik <octave@nomad.inbox5.com>
parents:
13709
diff
changeset
|
1502 disable_warning ("Octave:mixed-string-concat"); |
| 5794 | 1503 disable_warning ("Octave:variable-switch-label"); |
|
10605
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1504 |
|
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1505 // This should be an error unless we are in maximum braindamage mode. |
|
13841
0a158dbdb04a
Remove 3 unused warning ids
Rik <octave@nomad.inbox5.com>
parents:
13709
diff
changeset
|
1506 // FIXME: Not quite right. This sets the error state even for braindamage |
|
0a158dbdb04a
Remove 3 unused warning ids
Rik <octave@nomad.inbox5.com>
parents:
13709
diff
changeset
|
1507 // mode. Also, this error is not triggered in normal mode because another |
|
0a158dbdb04a
Remove 3 unused warning ids
Rik <octave@nomad.inbox5.com>
parents:
13709
diff
changeset
|
1508 // error handler catches it first and gives: |
|
0a158dbdb04a
Remove 3 unused warning ids
Rik <octave@nomad.inbox5.com>
parents:
13709
diff
changeset
|
1509 // error: subscript indices must be either positive integers or logicals |
|
0a158dbdb04a
Remove 3 unused warning ids
Rik <octave@nomad.inbox5.com>
parents:
13709
diff
changeset
|
1510 set_warning_state ("Octave:noninteger-range-as-index", "error"); |
|
10605
1834132fb50b
allow non-integer ranges as indices conditionally
John W. Eaton <jwe@octave.org>
parents:
10405
diff
changeset
|
1511 |
| 5794 | 1512 } |
| 1513 | |
| 6361 | 1514 DEFUN (lasterror, args, , |
| 1515 "-*- texinfo -*-\n\ | |
|
11572
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
1516 @deftypefn {Built-in Function} {@var{lasterr} =} lasterror ()\n\ |
|
7d6d8c1e471f
Grammarcheck Texinfo for files in src directory.
Rik <octave@nomad.inbox5.com>
parents:
11523
diff
changeset
|
1517 @deftypefnx {Built-in Function} {} lasterror (@var{err})\n\ |
|
14361
8de863b7126b
doc: Use Octave preference for double quote in docstrings in all .cc files
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
1518 @deftypefnx {Built-in Function} {} lasterror (\"reset\")\n\ |
|
14093
050bc580cb60
doc: Various docstring improvements before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents:
14072
diff
changeset
|
1519 Query or set the last error message structure. When called without\n\ |
|
050bc580cb60
doc: Various docstring improvements before 3.6.0 release.
Rik <octave@nomad.inbox5.com>
parents:
14072
diff
changeset
|
1520 arguments, return a structure containing the last error message and other\n\ |
|
12692
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1521 information related to this error. The elements of the structure are:\n\ |
| 6361 | 1522 \n\ |
| 1523 @table @asis\n\ | |
| 1524 @item 'message'\n\ | |
| 1525 The text of the last error message\n\ | |
| 10840 | 1526 \n\ |
| 6361 | 1527 @item 'identifier'\n\ |
| 1528 The message identifier of this error message\n\ | |
| 10840 | 1529 \n\ |
| 6361 | 1530 @item 'stack'\n\ |
|
12692
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1531 A structure containing information on where the message occurred. This may\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1532 be an empty structure if the information cannot\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1533 be obtained. The fields of the structure are:\n\ |
| 6361 | 1534 \n\ |
| 1535 @table @asis\n\ | |
| 1536 @item 'file'\n\ | |
| 1537 The name of the file where the error occurred\n\ | |
| 10840 | 1538 \n\ |
| 6361 | 1539 @item 'name'\n\ |
| 7001 | 1540 The name of function in which the error occurred\n\ |
| 10840 | 1541 \n\ |
| 6361 | 1542 @item 'line'\n\ |
| 7001 | 1543 The line number at which the error occurred\n\ |
| 10840 | 1544 \n\ |
| 6361 | 1545 @item 'column'\n\ |
| 1546 An optional field with the column number at which the error occurred\n\ | |
| 1547 @end table\n\ | |
| 1548 @end table\n\ | |
| 1549 \n\ | |
|
12692
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1550 The last error structure may be set by passing a scalar structure, @var{err},\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1551 as input. Any fields of @var{err} that match those above are set while any\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1552 unspecified fields are initialized with default values.\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1553 \n\ |
|
14361
8de863b7126b
doc: Use Octave preference for double quote in docstrings in all .cc files
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
1554 If @code{lasterror} is called with the argument \"reset\", all fields are\n\ |
| 6361 | 1555 set to their default values.\n\ |
|
12692
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1556 @seealso{lasterr}\n\ |
| 6361 | 1557 @end deftypefn") |
| 1558 { | |
| 1559 octave_value retval; | |
| 1560 int nargin = args.length(); | |
| 1561 | |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9753
diff
changeset
|
1562 unwind_protect frame; |
|
7976
736124a4fa3d
lasterr, lasterror: unwind-protect error_state
John W. Eaton <jwe@octave.org>
parents:
7882
diff
changeset
|
1563 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9753
diff
changeset
|
1564 frame.protect_var (error_state); |
|
7976
736124a4fa3d
lasterr, lasterror: unwind-protect error_state
John W. Eaton <jwe@octave.org>
parents:
7882
diff
changeset
|
1565 error_state = 0; |
|
736124a4fa3d
lasterr, lasterror: unwind-protect error_state
John W. Eaton <jwe@octave.org>
parents:
7882
diff
changeset
|
1566 |
| 6361 | 1567 if (nargin < 2) |
| 1568 { | |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1569 octave_scalar_map err; |
| 6361 | 1570 |
| 1571 err.assign ("message", Vlast_error_message); | |
| 1572 err.assign ("identifier", Vlast_error_id); | |
| 1573 | |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
1574 err.assign ("stack", octave_value (Vlast_error_stack)); |
| 6361 | 1575 |
| 1576 if (nargin == 1) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1577 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1578 if (args(0).is_string()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1579 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1580 if (args(0).string_value () == "reset") |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1581 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1582 Vlast_error_message = std::string(); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1583 Vlast_error_id = std::string(); |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
1584 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1585 Vlast_error_stack = initialize_last_error_stack (); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1586 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1587 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1588 error("lasterror: unrecognized string argument"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1589 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1590 else if (args(0).is_map ()) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1591 { |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1592 octave_scalar_map new_err = args(0).scalar_map_value (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1593 std::string new_error_message; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1594 std::string new_error_id; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1595 std::string new_error_file; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1596 std::string new_error_name; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1597 int new_error_line = -1; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1598 int new_error_column = -1; |
| 6361 | 1599 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1600 if (! error_state && new_err.contains ("message")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1601 { |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1602 const std::string tmp = |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1603 new_err.getfield("message").string_value (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1604 new_error_message = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1605 } |
| 6361 | 1606 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1607 if (! error_state && new_err.contains ("identifier")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1608 { |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1609 const std::string tmp = |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1610 new_err.getfield("identifier").string_value (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1611 new_error_id = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1612 } |
| 6361 | 1613 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1614 if (! error_state && new_err.contains ("stack")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1615 { |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1616 octave_scalar_map new_err_stack = |
|
14055
4000ad5fe0f6
extract correct struct field in lasterror
John W. Eaton <jwe@octave.org>
parents:
14042
diff
changeset
|
1617 new_err.getfield("stack").scalar_map_value (); |
| 6361 | 1618 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1619 if (! error_state && new_err_stack.contains ("file")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1620 { |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1621 const std::string tmp = |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1622 new_err_stack.getfield("file").string_value (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1623 new_error_file = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1624 } |
| 6361 | 1625 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1626 if (! error_state && new_err_stack.contains ("name")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1627 { |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1628 const std::string tmp = |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1629 new_err_stack.getfield("name").string_value (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1630 new_error_name = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1631 } |
| 6361 | 1632 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1633 if (! error_state && new_err_stack.contains ("line")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1634 { |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1635 const int tmp = |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1636 new_err_stack.getfield("line").nint_value (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1637 new_error_line = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1638 } |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1639 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1640 if (! error_state && new_err_stack.contains ("column")) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1641 { |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1642 const int tmp = |
|
11058
3329616444f0
replace Octave_map in debug.cc and error.cc
Jaroslav Hajek <highegg@gmail.com>
parents:
11029
diff
changeset
|
1643 new_err_stack.getfield("column").nint_value (); |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1644 new_error_column = tmp; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1645 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1646 } |
| 6361 | 1647 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1648 if (! error_state) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1649 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1650 Vlast_error_message = new_error_message; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1651 Vlast_error_id = new_error_id; |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
1652 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1653 octave_idx_type curr_frame = -1; |
|
9166
69088b7b139c
use complete stack trace information for lasterror
John W. Eaton <jwe@octave.org>
parents:
9153
diff
changeset
|
1654 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1655 Vlast_error_stack |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1656 = octave_call_stack::backtrace (0, curr_frame); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1657 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1658 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1659 else |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1660 error ("lasterror: argument must be a structure or a string"); |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1661 } |
| 6361 | 1662 |
| 6483 | 1663 if (! error_state) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1664 retval = err; |
| 6361 | 1665 } |
| 1666 else | |
| 1667 print_usage (); | |
| 1668 | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1669 return retval; |
| 6361 | 1670 } |
| 1671 | |
| 5567 | 1672 DEFUN (lasterr, args, nargout, |
| 3935 | 1673 "-*- texinfo -*-\n\ |
|
12692
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1674 @deftypefn {Built-in Function} {[@var{msg}, @var{msgid}] =} lasterr ()\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1675 @deftypefnx {Built-in Function} {} lasterr (@var{msg})\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1676 @deftypefnx {Built-in Function} {} lasterr (@var{msg}, @var{msgid})\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1677 Query or set the last error message. When called without input arguments,\n\ |
|
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1678 return the last error message and message identifier. With one\n\ |
| 5567 | 1679 argument, set the last error message to @var{msg}. With two arguments,\n\ |
| 1680 also set the last message identifier.\n\ | |
|
12692
e7b03b8662a2
doc: Update docstrings for a few functions
Rik <octave@nomad.inbox5.com>
parents:
12483
diff
changeset
|
1681 @seealso{lasterror}\n\ |
| 3935 | 1682 @end deftypefn") |
| 1683 { | |
| 1684 octave_value_list retval; | |
| 1685 | |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9753
diff
changeset
|
1686 unwind_protect frame; |
|
7976
736124a4fa3d
lasterr, lasterror: unwind-protect error_state
John W. Eaton <jwe@octave.org>
parents:
7882
diff
changeset
|
1687 |
|
10066
2cd940306a06
make unwind_protect frames local
Jaroslav Hajek <highegg@gmail.com>
parents:
9753
diff
changeset
|
1688 frame.protect_var (error_state); |
|
7976
736124a4fa3d
lasterr, lasterror: unwind-protect error_state
John W. Eaton <jwe@octave.org>
parents:
7882
diff
changeset
|
1689 error_state = 0; |
|
736124a4fa3d
lasterr, lasterror: unwind-protect error_state
John W. Eaton <jwe@octave.org>
parents:
7882
diff
changeset
|
1690 |
| 3935 | 1691 int argc = args.length () + 1; |
| 1692 | |
| 5567 | 1693 if (argc < 4) |
| 5335 | 1694 { |
| 1695 string_vector argv = args.make_argv ("lasterr"); | |
| 3935 | 1696 |
| 5335 | 1697 if (! error_state) |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1698 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1699 std::string prev_error_id = Vlast_error_id; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1700 std::string prev_error_message = Vlast_error_message; |
| 5567 | 1701 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1702 if (argc > 2) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1703 Vlast_error_id = argv(2); |
| 5567 | 1704 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1705 if (argc > 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1706 Vlast_error_message = argv(1); |
| 5567 | 1707 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1708 if (argc == 1 || nargout > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1709 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1710 retval(1) = prev_error_id; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1711 retval(0) = prev_error_message; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1712 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1713 } |
| 5567 | 1714 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1715 error ("lasterr: expecting arguments to be character strings"); |
| 5335 | 1716 } |
| 3935 | 1717 else |
| 5823 | 1718 print_usage (); |
| 3935 | 1719 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1720 return retval; |
| 3935 | 1721 } |
| 1722 | |
| 5567 | 1723 DEFUN (lastwarn, args, nargout, |
| 3934 | 1724 "-*- texinfo -*-\n\ |
| 5567 | 1725 @deftypefn {Built-in Function} {[@var{msg}, @var{msgid}] =} lastwarn (@var{msg}, @var{msgid})\n\ |
| 3935 | 1726 Without any arguments, return the last warning message. With one\n\ |
| 5567 | 1727 argument, set the last warning message to @var{msg}. With two arguments,\n\ |
| 1728 also set the last message identifier.\n\ | |
| 3934 | 1729 @end deftypefn") |
| 1730 { | |
| 1731 octave_value_list retval; | |
| 1732 | |
| 1733 int argc = args.length () + 1; | |
| 1734 | |
| 5567 | 1735 if (argc < 4) |
| 1736 { | |
| 1737 string_vector argv = args.make_argv ("lastwarn"); | |
| 1738 | |
| 1739 if (! error_state) | |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1740 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1741 std::string prev_warning_id = Vlast_warning_id; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1742 std::string prev_warning_message = Vlast_warning_message; |
| 5567 | 1743 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1744 if (argc > 2) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1745 Vlast_warning_id = argv(2); |
| 3934 | 1746 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1747 if (argc > 1) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1748 Vlast_warning_message = argv(1); |
| 5567 | 1749 |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1750 if (argc == 1 || nargout > 0) |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1751 { |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1752 warning_state = 0; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1753 retval(1) = prev_warning_id; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1754 retval(0) = prev_warning_message; |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1755 } |
|
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1756 } |
| 5567 | 1757 else |
|
10315
57a59eae83cc
untabify src C++ source files
John W. Eaton <jwe@octave.org>
parents:
10160
diff
changeset
|
1758 error ("lastwarn: expecting arguments to be character strings"); |
| 5567 | 1759 } |
| 3934 | 1760 else |
| 5823 | 1761 print_usage (); |
| 3934 | 1762 |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11572
diff
changeset
|
1763 return retval; |
| 897 | 1764 } |
| 1765 | |
| 1957 | 1766 DEFUN (usage, args, , |
| 3373 | 1767 "-*- texinfo -*-\n\ |
| 1768 @deftypefn {Built-in Function} {} usage (@var{msg})\n\ | |
| 1769 Print the message @var{msg}, prefixed by the string @samp{usage: }, and\n\ | |
| 1770 set Octave's internal error state such that control will return to the\n\ | |
| 1771 top level without evaluating any more commands. This is useful for\n\ | |
| 1772 aborting from functions.\n\ | |
| 1773 \n\ | |
| 1774 After @code{usage} is evaluated, Octave will print a traceback of all\n\ | |
| 1775 the function calls leading to the usage message.\n\ | |
| 899 | 1776 \n\ |
| 3373 | 1777 You should use this function for reporting problems errors that result\n\ |
| 1778 from an improper call to a function, such as calling a function with an\n\ | |
| 1779 incorrect number of arguments, or with arguments of the wrong type. For\n\ | |
| 1780 example, most functions distributed with Octave begin with code like\n\ | |
| 1781 this\n\ | |
| 1782 \n\ | |
| 1783 @example\n\ | |
| 1784 @group\n\ | |
| 1785 if (nargin != 2)\n\ | |
| 1786 usage (\"foo (a, b)\");\n\ | |
| 1787 endif\n\ | |
| 1788 @end group\n\ | |
| 1789 @end example\n\ | |
| 1790 \n\ | |
| 1791 @noindent\n\ | |
| 1792 to check for the proper number of arguments.\n\ | |
| 1793 @end deftypefn") | |
| 899 | 1794 { |
| 3934 | 1795 octave_value_list retval; |
|
14558
0c9c85e702ca
better compatibility for error/warning message IDs and format specifiers
John W. Eaton <jwe@octave.org>
parents:
14361
diff
changeset
|
1796 handle_message (usage_with_id, "", "unknown", args, true); |
| 3934 | 1797 return retval; |
| 899 | 1798 } |
| 1799 | |
| 5794 | 1800 DEFUN (beep_on_error, args, nargout, |
| 1801 "-*- texinfo -*-\n\ | |
| 10840 | 1802 @deftypefn {Built-in Function} {@var{val} =} beep_on_error ()\n\ |
| 5794 | 1803 @deftypefnx {Built-in Function} {@var{old_val} =} beep_on_error (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1804 @deftypefnx {Built-in Function} {} beep_on_error (@var{new_val}, \"local\")\n\ |
| 5794 | 1805 Query or set the internal variable that controls whether Octave will try\n\ |
| 1806 to ring the terminal bell before printing an error message.\n\ | |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1807 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1808 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1809 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1810 variable value is restored when exiting the function.\n\ |
| 5794 | 1811 @end deftypefn") |
| 3707 | 1812 { |
| 5794 | 1813 return SET_INTERNAL_VARIABLE (beep_on_error); |
| 3707 | 1814 } |
| 1815 | |
| 5794 | 1816 DEFUN (debug_on_error, args, nargout, |
| 3373 | 1817 "-*- texinfo -*-\n\ |
| 10840 | 1818 @deftypefn {Built-in Function} {@var{val} =} debug_on_error ()\n\ |
| 5794 | 1819 @deftypefnx {Built-in Function} {@var{old_val} =} debug_on_error (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1820 @deftypefnx {Built-in Function} {} debug_on_error (@var{new_val}, \"local\")\n\ |
| 5794 | 1821 Query or set the internal variable that controls whether Octave will try\n\ |
| 3707 | 1822 to enter the debugger when an error is encountered. This will also\n\ |
| 1823 inhibit printing of the normal traceback message (you will only see\n\ | |
| 5794 | 1824 the top-level error message).\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1825 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1826 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1827 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1828 variable value is restored when exiting the function.\n\ |
| 5794 | 1829 @end deftypefn") |
| 1830 { | |
| 1831 return SET_INTERNAL_VARIABLE (debug_on_error); | |
| 1832 } | |
| 3707 | 1833 |
| 5794 | 1834 DEFUN (debug_on_warning, args, nargout, |
| 3707 | 1835 "-*- texinfo -*-\n\ |
| 10840 | 1836 @deftypefn {Built-in Function} {@var{val} =} debug_on_warning ()\n\ |
| 5794 | 1837 @deftypefnx {Built-in Function} {@var{old_val} =} debug_on_warning (@var{new_val})\n\ |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1838 @deftypefnx {Built-in Function} {} debug_on_warning (@var{new_val}, \"local\")\n\ |
| 5794 | 1839 Query or set the internal variable that controls whether Octave will try\n\ |
| 1840 to enter the debugger when a warning is encountered.\n\ | |
|
13951
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1841 \n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1842 When called from inside a function with the \"local\" option, the variable is\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1843 changed locally for the function and any subroutines it calls. The original\n\ |
|
79aa00a94e9e
doc: Document "local" option for configuration variables.
Rik <octave@nomad.inbox5.com>
parents:
13841
diff
changeset
|
1844 variable value is restored when exiting the function.\n\ |
| 5794 | 1845 @end deftypefn") |
| 1846 { | |
| 1847 return SET_INTERNAL_VARIABLE (debug_on_warning); | |
| 2174 | 1848 } |
| 1849 | |
|
7977
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1850 std::string |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1851 last_error_message (void) |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1852 { |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1853 return Vlast_error_message; |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1854 } |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1855 |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1856 std::string |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1857 last_error_id (void) |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1858 { |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1859 return Vlast_error_id; |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1860 } |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1861 |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1862 std::string |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1863 last_warning_message (void) |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1864 { |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1865 return Vlast_warning_message; |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1866 } |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1867 |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1868 std::string |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1869 last_warning_id (void) |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1870 { |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1871 return Vlast_warning_id; |
|
065c28e1c368
Modify Fcellfun to directly access the error message/id rather than use a call to Flasterr
David Bateman <dbateman@free.fr>
parents:
7976
diff
changeset
|
1872 } |
|
11029
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1873 |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1874 void |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1875 interpreter_try (unwind_protect& frame) |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1876 { |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1877 frame.protect_var (error_state); |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1878 frame.protect_var (buffer_error_messages); |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1879 frame.protect_var (Vdebug_on_error); |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1880 frame.protect_var (Vdebug_on_warning); |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1881 |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1882 buffer_error_messages++; |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1883 Vdebug_on_error = false; |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1884 Vdebug_on_warning = false; |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1885 } |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1886 |
|
4ab04ea74b08
make an internal function for try simulation
Jaroslav Hajek <highegg@gmail.com>
parents:
10840
diff
changeset
|
1887 |