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