Mercurial > octave

diff libinterp/corefcn/utils.cc @ 30896:c9788d7f6e65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Use "fcn" as preferred abbreviation for "function" in libinterp/. * __eigs__.cc, bsxfun.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, error.cc, graphics.cc, graphics.in.h, gzfstream.h, ls-hdf5.cc, lsode.cc, max.cc, oct-opengl.h, quad.cc, strfns.cc, utils.cc, utils.h, variables.cc, __ode15__.cc, gzip.cc, cdef-manager.cc, ov-fcn-handle.cc, ov-java.cc, ov-usr-fcn.cc, bp-table.cc, bp-table.h, lex.h, lex.ll, oct-parse.yy, pt-eval.cc: Replace "func", "fun", "fn" in documentation and variable names with "fcn".
author Rik <rik@octave.org>
date Tue, 05 Apr 2022 08:33:58 -0700
parents 32d2b6604a9f
children 670a0d878af1
line wrap: on
line diff
--- a/libinterp/corefcn/utils.cc	Tue Apr 05 01:06:00 2022 -0400
+++ b/libinterp/corefcn/utils.cc	Tue Apr 05 08:33:58 2022 -0700
@@ -1658,8 +1658,8 @@
 */
 
   octave_value_list
-  do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int),
-                     const char *fun_name, const octave_value_list& args,
+  do_simple_cellfun (octave_value_list (*fcn) (const octave_value_list&, int),
+                     const char *fcn_name, const octave_value_list& args,
                      int nargout)
   {
     octave_value_list new_args = args;
@@ -1693,7 +1693,7 @@
                 dims = ccells[i].dims ();
               }
             else if (dims != ccells[i].dims ())
-              error ("%s: cell arguments must have matching sizes", fun_name);
+              error ("%s: cell arguments must have matching sizes", fcn_name);
           }
       }
 
@@ -1708,10 +1708,10 @@
 
         octave_quit ();
 
-        const octave_value_list tmp = fun (new_args, nargout);
+        const octave_value_list tmp = fcn (new_args, nargout);
 
         if (tmp.length () < nargout)
-          error ("%s: do_simple_cellfun: internal error", fun_name);
+          error ("%s: do_simple_cellfun: internal error", fcn_name);
 
         for (int i = 0; i < nargout; i++)
           rcells[i](j) = tmp(i);
@@ -1726,12 +1726,12 @@
   }
 
   octave_value
-  do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int),
-                     const char *fun_name, const octave_value_list& args)
+  do_simple_cellfun (octave_value_list (*fcn) (const octave_value_list&, int),
+                     const char *fcn_name, const octave_value_list& args)
   {
     octave_value retval;
 
-    const octave_value_list tmp = do_simple_cellfun (fun, fun_name, args, 1);
+    const octave_value_list tmp = do_simple_cellfun (fcn, fcn_name, args, 1);
 
     if (tmp.length () > 0)
       retval = tmp(0);