Mercurial > octave
diff libinterp/octave-value/ov-fcn-inline.cc @ 20939:b17fda023ca6
maint: Use new C++ archetype in more files.
Place input validation first in files.
Move declaration of retval down in function to be closer to point of usage.
Eliminate else clause after if () error.
Use "return ovl()" where it makes sense.
* find.cc, gammainc.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc,
graphics.cc, help.cc, hess.cc, hex2num.cc, input.cc, kron.cc, load-path.cc,
load-save.cc, lookup.cc, mappers.cc, matrix_type.cc, mgorth.cc, nproc.cc,
ordschur.cc, pager.cc, pinv.cc, pr-output.cc, profiler.cc, psi.cc, quad.cc,
rcond.cc, regexp.cc, schur.cc, sighandlers.cc, sparse.cc, str2double.cc,
strfind.cc, strfns.cc, sub2ind.cc, svd.cc, sylvester.cc, symtab.cc,
syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc,
urlwrite.cc, utils.cc, variables.cc, __delaunayn__.cc, __eigs__.cc,
__glpk__.cc, __magick_read__.cc, __osmesa_print__.cc, __voronoi__.cc, amd.cc,
audiodevinfo.cc, audioread.cc, chol.cc, colamd.cc, dmperm.cc, fftw.cc, qr.cc,
symbfact.cc, symrcm.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc,
ov-java.cc, ov-null-mat.cc, ov-oncleanup.cc, ov-re-mat.cc, ov-struct.cc,
ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc, octave.cc:
Use new C++ archetype in more files.
| author | Rik <rik@octave.org> |
|---|---|
| date | Fri, 18 Dec 2015 15:37:22 -0800 |
| parents | 384ff5aa9437 |
| children | 77f5591878bf |
line wrap: on
line diff
--- a/libinterp/octave-value/ov-fcn-inline.cc Fri Dec 18 16:22:53 2015 -0500 +++ b/libinterp/octave-value/ov-fcn-inline.cc Fri Dec 18 15:37:22 2015 -0800 @@ -675,8 +675,6 @@ @seealso{argnames, formula, vectorize, str2func}\n\ @end deftypefn") { - octave_value retval; - int nargin = args.length (); if (nargin == 0) @@ -735,8 +733,7 @@ if (c == 'e' || c == 'E') { // possible number in exponent form, not arg - if (isdigit (fun[i]) - || fun[i] == '-' || fun[i] == '+') + if (isdigit (fun[i]) || fun[i] == '-' || fun[i] == '+') continue; } is_arg = true; @@ -809,7 +806,7 @@ } } - return octave_value (new octave_fcn_inline (fun, fargs)); + return ovl (new octave_fcn_inline (fun, fargs)); } /* @@ -839,19 +836,15 @@ @seealso{char, argnames, inline, vectorize}\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 1) print_usage (); octave_fcn_inline* fn = args(0).fcn_inline_value (true); - if (fn) - retval = octave_value (fn->fcn_text ()); - else + if (! fn) error ("formula: FUN must be an inline function"); - return retval; + return ovl (fn->fcn_text ()); } /* @@ -872,28 +865,22 @@ @seealso{inline, formula, vectorize}\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 1) print_usage (); octave_fcn_inline *fn = args(0).fcn_inline_value (true); - if (fn) - { - string_vector t1 = fn->fcn_arg_names (); - - Cell t2 (dim_vector (t1.numel (), 1)); - - for (int i = 0; i < t1.numel (); i++) - t2(i) = t1(i); - - retval = t2; - } - else + if (! fn) error ("argnames: FUN must be an inline function"); - return retval; + string_vector t1 = fn->fcn_arg_names (); + + Cell t2 (dim_vector (t1.numel (), 1)); + + for (int i = 0; i < t1.numel (); i++) + t2(i) = t1(i); + + return ovl (t2); } /* @@ -927,8 +914,6 @@ @seealso{inline, formula, argnames}\n\ @end deftypefn") { - octave_value retval; - if (args.length () != 1) print_usage (); @@ -974,12 +959,9 @@ } if (func_is_string) - retval = octave_value (new_func); + return ovl (new_func); else - retval = octave_value (new octave_fcn_inline - (new_func, old->fcn_arg_names ())); - - return retval; + return ovl (new octave_fcn_inline (new_func, old->fcn_arg_names ())); } /*