Mercurial > octave
diff libinterp/corefcn/error.cc @ 20996:20bd3d4fabad
Clean up instances of make_argv().
* error.cc (Fwarning, Flasterr, Flastwarn): Use '[]' to access element of
vector, rather than '()'.
* help.cc (F__which__): Call make_argv without an argument rather than with "".
* input.cc: (Fecho): Call make_argv without an argument rather than with "".
* load-save.cc: Remove useless comments. Re-indent lines. Join lines
unnecessarily split.
* ovl.cc (make_argv): Invert if/else/error.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sun, 27 Dec 2015 12:25:03 -0800 |
| parents | 81c2b14c209f |
| children | 85dfb551e4cd |
line wrap: on
line diff
--- a/libinterp/corefcn/error.cc Mon Dec 28 16:44:10 2015 +0100 +++ b/libinterp/corefcn/error.cc Sun Dec 27 12:25:03 2015 -0800 @@ -1475,17 +1475,17 @@ { string_vector argv = args.make_argv ("warning"); - std::string arg1 = argv(1); + std::string arg1 = argv[1]; std::string arg2 = "all"; if (nargin >= 2) - arg2 = argv(2); + arg2 = argv[2]; if (arg1 == "on" || arg1 == "off" || arg1 == "error") { octave_map old_warning_options = warning_options; - if (nargin == 3 && argv(3) == "local" + if (nargin == 3 && argv[3] == "local" && ! symbol_table::at_top_level ()) { symbol_table::scope_id scope @@ -1974,13 +1974,13 @@ if (nargin == 2) { - Vlast_error_id = argv(2); - Vlast_error_message = argv(1); + Vlast_error_id = argv[2]; + Vlast_error_message = argv[1]; } else if (nargin == 1) { Vlast_error_id = ""; - Vlast_error_message = argv(1); + Vlast_error_message = argv[1]; } if (nargin == 0 || nargout > 0) @@ -2017,13 +2017,13 @@ if (nargin == 2) { - Vlast_warning_id = argv(2); - Vlast_warning_message = argv(1); + Vlast_warning_id = argv[2]; + Vlast_warning_message = argv[1]; } else if (nargin == 1) { Vlast_warning_id = ""; - Vlast_warning_message = argv(1); + Vlast_warning_message = argv[1]; } if (nargin == 0 || nargout > 0)