Mercurial > octave
diff libinterp/corefcn/__dispatch__.cc @ 20802:8bb38ba1bad6
eliminate return statements after calls to print_usage
* __contourc__.cc, __dispatch__.cc, __dsearchn__.cc, __ichol__.cc,
__lin_interpn__.cc, __qp__.cc, balance.cc, betainc.cc, bsxfun.cc,
colloc.cc, daspk.cc, dasrt.cc, dassl.cc, defaults.cc, det.cc,
dlmread.cc, dot.cc, eig.cc, ellipj.cc, fft.cc, fft2.cc, fftn.cc,
filter.cc, find.cc, gcd.cc, givens.cc, hex2num.cc, inv.cc, lookup.cc,
lu.cc, max.cc, mgorth.cc, ordschur.cc, pinv.cc, profiler.cc, quad.cc,
qz.cc, rcond.cc, schur.cc, str2double.cc:
Eliminate return statements after calls to print_usage.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 04 Dec 2015 12:03:44 -0500 |
| parents | 68e3a747ca02 |
| children | 6f0bd96f93c0 |
line wrap: on
line diff
--- a/libinterp/corefcn/__dispatch__.cc Thu Dec 03 19:22:54 2015 -0500 +++ b/libinterp/corefcn/__dispatch__.cc Fri Dec 04 12:03:44 2015 -0500 @@ -46,61 +46,59 @@ int nargin = args.length (); - if (nargin > 0 && nargin < 4) - { - std::string f, r, t; + if (nargin < 1 || nargin > 3) + print_usage (); - f = args(0).xstring_value ("__dispatch__: first argument must be a function name"); + std::string f, r, t; - if (nargin > 1) - r = args(1).xstring_value ("__dispatch__: second argument must be a function name"); + f = args(0).xstring_value ("__dispatch__: first argument must be a function name"); - if (nargin > 2) - t = args(2).xstring_value ("__dispatch__: third argument must be a type name"); + if (nargin > 1) + r = args(1).xstring_value ("__dispatch__: second argument must be a function name"); - if (nargin == 1) + if (nargin > 2) + t = args(2).xstring_value ("__dispatch__: third argument must be a type name"); + + if (nargin == 1) + { + if (nargout > 0) { - if (nargout > 0) - { - symbol_table::fcn_info::dispatch_map_type dm - = symbol_table::get_dispatch (f); - - size_t len = dm.size (); - - Cell type_field (len, 1); - Cell name_field (len, 1); + symbol_table::fcn_info::dispatch_map_type dm + = symbol_table::get_dispatch (f); - symbol_table::fcn_info::dispatch_map_type::const_iterator p - = dm.begin (); + size_t len = dm.size (); - for (size_t i = 0; i < len; i++) - { - type_field(i) = p->first; - name_field(i) = p->second; + Cell type_field (len, 1); + Cell name_field (len, 1); - p++; - } - - octave_scalar_map m; + symbol_table::fcn_info::dispatch_map_type::const_iterator p + = dm.begin (); - m.assign ("type", type_field); - m.assign ("name", name_field); + for (size_t i = 0; i < len; i++) + { + type_field(i) = p->first; + name_field(i) = p->second; - retval = m; + p++; } - else - symbol_table::print_dispatch (octave_stdout, f); - } - else if (nargin == 2) - { - t = r; - symbol_table::clear_dispatch (f, t); + + octave_scalar_map m; + + m.assign ("type", type_field); + m.assign ("name", name_field); + + retval = m; } else - symbol_table::add_dispatch (f, t, r); + symbol_table::print_dispatch (octave_stdout, f); + } + else if (nargin == 2) + { + t = r; + symbol_table::clear_dispatch (f, t); } else - print_usage (); + symbol_table::add_dispatch (f, t, r); return retval; }