Mercurial > octave-nkf

changeset 10428:fb8c9db4a39c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix parsing of function names in cellfun
author Jaroslav Hajek <highegg@gmail.com>
date Sun, 21 Mar 2010 15:35:50 +0100
parents 62bb59f927b1
children ae31852abf75
files src/ChangeLog src/DLD-FUNCTIONS/cellfun.cc
diffstat 2 files changed, 11 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Mar 20 14:26:03 2010 -0700
+++ b/src/ChangeLog	Sun Mar 21 15:35:50 2010 +0100
@@ -1,3 +1,8 @@
+2010-03-21  Jaroslav Hajek  <highegg@gmail.com>
+
+	* DLD-FUNCTIONS/cellfun.cc (Fcellfun): Fix the parsing of string
+	function arguments.
+
 2010-03-20  John W. Eaton  <jwe@octave.org>
 
 	* lex.ll: Don't undefine GNULIB_NAMESPACE.  Define fprintf,
--- a/src/DLD-FUNCTIONS/cellfun.cc	Sat Mar 20 14:26:03 2010 -0700
+++ b/src/DLD-FUNCTIONS/cellfun.cc	Sun Mar 21 15:35:50 2010 +0100
@@ -518,10 +518,12 @@
               if (ptr_func && ! error_state)
                 func = octave_value (ptr_func, true);
             }
-
-          func = symbol_table::find_function (name);
-          if (func.is_undefined ())
-            error ("cellfun: invalid function name: %s", name.c_str ());
+          else
+            {
+              func = symbol_table::find_function (name);
+              if (func.is_undefined ())
+                error ("cellfun: invalid function name: %s", name.c_str ());
+            }
         }
     }