Mercurial > octave-nkf

diff libinterp/octave-value/ov-usr-fcn.cc @ 20536:1f330d33388f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Periodic merge of stable to default.
author Rik <rik@octave.org>
date Tue, 22 Sep 2015 04:50:47 -0700
parents 7ac907da9fba 19617a5b7202
children b10432a40432
line wrap: on
line diff
--- a/libinterp/octave-value/ov-usr-fcn.cc	Tue Sep 22 11:25:04 2015 +0200
+++ b/libinterp/octave-value/ov-usr-fcn.cc	Tue Sep 22 04:50:47 2015 -0700
@@ -866,7 +866,10 @@
           std::string name = func.string_value ();
           func = symbol_table::find_function (name);
           if (func.is_undefined ())
-            error ("nargout: invalid function name: %s", name.c_str ());
+            {
+              error ("nargin: invalid function name: %s", name.c_str ());
+              return retval;
+            }
         }
 
       octave_function *fcn_val = func.function_value ();
@@ -973,7 +976,10 @@
           std::string name = func.string_value ();
           func = symbol_table::find_function (name);
           if (func.is_undefined ())
-            error ("nargout: invalid function name: %s", name.c_str ());
+            {
+              error ("nargout: invalid function name: %s", name.c_str ());
+              return retval;
+            }
         }
 
       if (func.is_inline_function ())