Mercurial > jwe > octave
changeset 20818:cef0448a6ed2
eliminate unnecessary uses of nargin
* __glpk__.cc, chol.cc, dmperm.cc, qr.cc, symrcm.cc, ov-cell.cc,
ov-fcn-handle.cc, ov-fcn-inline.cc, ov-null-mat.cc, ov-struct.cc,
ov-type-conv.h, ov-usr-fcn.cc, oct-parse.in.yy, pt-misc.cc:
Don't use nargin variable unless it is used more than once.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Mon, 07 Dec 2015 13:26:03 -0500 |
| parents | 3d551b2ae928 |
| children | f428cbe7576f |
| files | libinterp/dldfcn/__glpk__.cc libinterp/dldfcn/chol.cc libinterp/dldfcn/dmperm.cc libinterp/dldfcn/qr.cc libinterp/dldfcn/symrcm.cc libinterp/octave-value/ov-cell.cc libinterp/octave-value/ov-fcn-handle.cc libinterp/octave-value/ov-fcn-inline.cc libinterp/octave-value/ov-null-mat.cc libinterp/octave-value/ov-struct.cc libinterp/octave-value/ov-type-conv.h libinterp/octave-value/ov-usr-fcn.cc libinterp/parse-tree/oct-parse.in.yy libinterp/parse-tree/pt-misc.cc |
| diffstat | 14 files changed, 30 insertions(+), 81 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/dldfcn/__glpk__.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/dldfcn/__glpk__.cc Mon Dec 07 13:26:03 2015 -0500 @@ -345,10 +345,8 @@ #if defined (HAVE_GLPK) - int nargin = args.length (); - // FIXME: Should we even need checking for an internal function? - if (nargin != 9) + if (args.length () != 9) print_usage (); //-- 1nd Input. A column array containing the objective function
--- a/libinterp/dldfcn/chol.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/dldfcn/chol.cc Mon Dec 07 13:26:03 2015 -0500 @@ -350,9 +350,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); octave_value arg = args(0); @@ -481,9 +479,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); octave_value arg = args(0); @@ -785,9 +781,7 @@ { octave_value_list retval; - int nargin = args.length (); - - if (nargin != 3) + if (args.length () != 3) print_usage (); octave_value argr = args(0); @@ -1032,9 +1026,7 @@ { octave_value_list retval; - int nargin = args.length (); - - if (nargin != 2) + if (args.length () != 2) print_usage (); octave_value argr = args(0); @@ -1166,9 +1158,7 @@ { octave_value_list retval; - int nargin = args.length (); - - if (nargin != 3) + if (args.length () != 3) print_usage (); octave_value argr = args(0);
--- a/libinterp/dldfcn/dmperm.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/dldfcn/dmperm.cc Mon Dec 07 13:26:03 2015 -0500 @@ -154,9 +154,8 @@ @end deftypefn") { octave_value_list retval; - int nargin = args.length (); - if (nargin != 1) + if (args.length () != 1) print_usage (); #if HAVE_CXSPARSE @@ -200,9 +199,8 @@ @end deftypefn") { octave_value_list retval; - int nargin = args.length (); - if (nargin != 1) + if (args.length () != 1) print_usage (); #if HAVE_CXSPARSE
--- a/libinterp/dldfcn/qr.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/dldfcn/qr.cc Mon Dec 07 13:26:03 2015 -0500 @@ -758,9 +758,7 @@ { octave_value_list retval; - int nargin = args.length (); - - if (nargin != 4) + if (args.length () != 4) print_usage (); octave_value argq = args(0); @@ -1409,9 +1407,8 @@ @end deftypefn") { octave_value_list retval; - int nargin = args.length (); - if (nargin != 4) + if (args.length () != 4) print_usage (); octave_value argq = args(0);
--- a/libinterp/dldfcn/symrcm.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/dldfcn/symrcm.cc Mon Dec 07 13:26:03 2015 -0500 @@ -438,9 +438,8 @@ @end deftypefn") { octave_value retval; - int nargin = args.length (); - if (nargin != 1) + if (args.length () != 1) print_usage (); octave_value arg = args(0);
--- a/libinterp/octave-value/ov-cell.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/octave-value/ov-cell.cc Mon Dec 07 13:26:03 2015 -0500 @@ -1382,9 +1382,7 @@ @seealso{cell2struct, fieldnames}\n\ @end deftypefn") { - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); const octave_map m = args(0).xmap_value ("struct2cell: argument S must be a structure");
--- a/libinterp/octave-value/ov-fcn-handle.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/octave-value/ov-fcn-handle.cc Mon Dec 07 13:26:03 2015 -0500 @@ -1846,6 +1846,7 @@ @end deftypefn") { octave_value retval; + int nargin = args.length (); if (nargin < 1 || nargin > 2) @@ -1907,9 +1908,7 @@ @seealso{isa, typeinfo, class, functions}\n\ @end deftypefn") { - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); return octave_value (args(0).is_function_handle ());
--- a/libinterp/octave-value/ov-fcn-inline.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/octave-value/ov-fcn-inline.cc Mon Dec 07 13:26:03 2015 -0500 @@ -849,9 +849,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); octave_fcn_inline* fn = args(0).fcn_inline_value (true); @@ -884,9 +882,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); octave_fcn_inline *fn = args(0).fcn_inline_value (true); @@ -941,9 +937,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); std::string old_func;
--- a/libinterp/octave-value/ov-null-mat.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/octave-value/ov-null-mat.cc Mon Dec 07 13:26:03 2015 -0500 @@ -114,9 +114,7 @@ @seealso{isempty, isindex}\n\ @end deftypefn") { - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); return octave_value (args(0).is_null_value ());
--- a/libinterp/octave-value/ov-struct.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/octave-value/ov-struct.cc Mon Dec 07 13:26:03 2015 -0500 @@ -1898,9 +1898,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 2) + if (args.length () != 2) print_usage (); retval = false; @@ -1952,9 +1950,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); if (args(0).is_map ()) @@ -2123,9 +2119,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 2) + if (args.length () != 2) print_usage (); octave_map m = args(0).xmap_value ("rmfield: first argument must be a struct");
--- a/libinterp/octave-value/ov-type-conv.h Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/octave-value/ov-type-conv.h Mon Dec 07 13:26:03 2015 -0500 @@ -78,9 +78,7 @@ \ octave_value retval; \ \ - int nargin = args.length (); \ - \ - if (nargin != 1) \ + if (args.length () != 1) \ print_usage (); \ \ const octave_value arg = args(0); \
--- a/libinterp/octave-value/ov-usr-fcn.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/octave-value/ov-usr-fcn.cc Mon Dec 07 13:26:03 2015 -0500 @@ -499,8 +499,6 @@ return retval; #endif - int nargin = args.length (); - unwind_protect frame; frame.protect_var (call_depth); @@ -576,8 +574,8 @@ frame.add_fcn (symbol_table::clear_variables); } - bind_automatic_vars (arg_names, nargin, nargout, all_va_args (args), - lvalue_list); + bind_automatic_vars (arg_names, args.length (), nargout, + all_va_args (args), lvalue_list); frame.add_method (this, &octave_user_function::restore_warning_states); @@ -1078,9 +1076,7 @@ { octave_value retval; - int nargin = args.length (); - - if (nargin != 1) + if (args.length () != 1) print_usage (); if (! symbol_table::at_top_level ())
--- a/libinterp/parse-tree/oct-parse.in.yy Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/parse-tree/oct-parse.in.yy Mon Dec 07 13:26:03 2015 -0500 @@ -4682,9 +4682,7 @@ { octave_value_list retval; - int nargin = args.length (); - - if (nargin > 0) + if (args.length () > 0) { octave_value f_arg = args(0); @@ -4751,9 +4749,7 @@ instead.\n\ @end deftypefn") { - int nargin = args.length (); - - if (nargin == 0) + if (args.length () == 0) print_usage (); return feval (args, nargout); @@ -4787,9 +4783,7 @@ { octave_value_list retval; - int nargin = args.length (); - - if (nargin == 0) + if (args.length () == 0) print_usage (); const std::string name (args(0).xstring_value ("builtin: function name (F) must be a string")); @@ -5049,9 +5043,7 @@ { octave_value_list retval; - int nargin = args.length (); - - if (nargin != 3) + if (args.length () != 3) print_usage (); std::string context = args(0).xstring_value ("assignin: CONTEXT must be a string");
--- a/libinterp/parse-tree/pt-misc.cc Mon Dec 07 09:32:33 2015 -0800 +++ b/libinterp/parse-tree/pt-misc.cc Mon Dec 07 13:26:03 2015 -0500 @@ -179,8 +179,6 @@ void tree_parameter_list::define_from_arg_vector (const octave_value_list& args) { - int nargin = args.length (); - int expected_nargin = length (); iterator p = begin (); @@ -191,7 +189,7 @@ octave_lvalue ref = elt->lvalue (); - if (i < nargin) + if (i < args.length ()) { if (args(i).is_defined () && args(i).is_magic_colon ()) {