Mercurial > octave-nkf

changeset 14454:2232931f2494

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Return regexp output when input is a cellstr and there is no return variable assignment. regexp.cc (regexp, regexpi): Return output when nargout == 0.
author Rik <octave@nomad.inbox5.com>
date Sun, 11 Mar 2012 14:14:01 -0700
parents 8bfa6e2bb4ed
children c57f9c911053
files src/DLD-FUNCTIONS/regexp.cc
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/regexp.cc	Sun Mar 11 13:43:49 2012 -0700
+++ b/src/DLD-FUNCTIONS/regexp.cc	Sun Mar 11 14:14:01 2012 -0700
@@ -641,7 +641,7 @@
   if (nargin < 2)
     print_usage ();
   else if (args(0).is_cell () || args(1).is_cell ())
-    retval = octcellregexp (args, nargout, "regexp");
+    retval = octcellregexp (args, (nargout > 0 ? nargout : 1), "regexp");
   else
     retval = octregexp (args, nargout, "regexp");
 
@@ -889,7 +889,7 @@
   if (nargin < 2)
     print_usage ();
   else if (args(0).is_cell () || args(1).is_cell ())
-    retval = octcellregexp (args, nargout, "regexpi", true);
+    retval = octcellregexp (args, (nargout > 0 ? nargout : 1), "regexpi", true);
   else
     retval = octregexp (args, nargout, "regexpi", true);