Mercurial > octave

diff libinterp/corefcn/error.cc @ 20817:3d551b2ae928

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use variable name nargin consistently in C++ code. * debug.cc (do_dbstack): Rename variable len to nargin. Change type to int from octave_idx_type. * dirfns.cc (Fcd): Rename variable argc to nargin and update code. Add nargin checking and print_usage. Replace make_argv call with xstring_value() call. Use !empty() rather than length > 0 for clarity. * error.cc (Flasterr, Flastwarn): Rename variable argc to nargin and update code. * filter.cc (Ffilter): Remove extra space in nargin declaration. * input.cc (Fecho): Rename variable argc to nargin and update code. * load-path.cc (Fpath): Rename variable argc to nargin and update code. Eliminate unnecessary declaration of "octave_value retval;". Add more calling forms to docstring. * pager.cc (Fdiary): Rename variable argc to nargin and update code. Replace make_argv call with xstring_value() call. Eliminate unnecessary declaration of "octave_value retval;".
author Rik <rik@octave.org>
date Mon, 07 Dec 2015 09:32:33 -0800
parents c22206c1a88f
children f428cbe7576f
line wrap: on
line diff
--- a/libinterp/corefcn/error.cc	Mon Dec 07 08:30:51 2015 -0800
+++ b/libinterp/corefcn/error.cc	Mon Dec 07 09:32:33 2015 -0800
@@ -1961,25 +1961,24 @@
 @seealso{lasterror, error, lastwarn}\n\
 @end deftypefn")
 {
-  octave_value_list retval;
+  int nargin = args.length ();
 
-  int argc = args.length () + 1;
-
-  if (argc > 3)
+  if (nargin > 2)
     print_usage ();
 
+  octave_value_list retval;
   string_vector argv = args.make_argv ("lasterr");
 
   std::string prev_error_id = Vlast_error_id;
   std::string prev_error_message = Vlast_error_message;
 
-  if (argc > 2)
+  if (nargin == 2)
     Vlast_error_id = argv(2);
 
-  if (argc > 1)
+  if (nargin > 0)
     Vlast_error_message = argv(1);
 
-  if (argc == 1 || nargout > 0)
+  if (nargin == 0 || nargout > 0)
     {
       retval(1) = prev_error_id;
       retval(0) = prev_error_message;
@@ -2004,25 +2003,25 @@
 @seealso{warning, lasterror, lasterr}\n\
 @end deftypefn")
 {
-  octave_value_list retval;
 
-  int argc = args.length () + 1;
+  int nargin = args.length ();
 
-  if (argc > 3)
+  if (nargin > 2)
     print_usage ();
 
+  octave_value_list retval;
   string_vector argv = args.make_argv ("lastwarn");
 
   std::string prev_warning_id = Vlast_warning_id;
   std::string prev_warning_message = Vlast_warning_message;
 
-  if (argc > 2)
+  if (nargin == 2)
     Vlast_warning_id = argv(2);
 
-  if (argc > 1)
+  if (nargin > 0)
     Vlast_warning_message = argv(1);
 
-  if (argc == 1 || nargout > 0)
+  if (nargin == 0 || nargout > 0)
     {
       retval(1) = prev_warning_id;
       retval(0) = prev_warning_message;