Mercurial > hg > octave-lyh

comparison src/DLD-FUNCTIONS/regexp.cc @ 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 bd592d5482c0
comparison
equal deleted inserted replaced
14453:8bfa6e2bb4ed 14454:2232931f2494
639 int nargin = args.length (); 639 int nargin = args.length ();
640 640
641 if (nargin < 2) 641 if (nargin < 2)
642 print_usage (); 642 print_usage ();
643 else if (args(0).is_cell () || args(1).is_cell ()) 643 else if (args(0).is_cell () || args(1).is_cell ())
644 retval = octcellregexp (args, nargout, "regexp"); 644 retval = octcellregexp (args, (nargout > 0 ? nargout : 1), "regexp");
645 else 645 else
646 retval = octregexp (args, nargout, "regexp"); 646 retval = octregexp (args, nargout, "regexp");
647 647
648 return retval; 648 return retval;
649 } 649 }
887 int nargin = args.length (); 887 int nargin = args.length ();
888 888
889 if (nargin < 2) 889 if (nargin < 2)
890 print_usage (); 890 print_usage ();
891 else if (args(0).is_cell () || args(1).is_cell ()) 891 else if (args(0).is_cell () || args(1).is_cell ())
892 retval = octcellregexp (args, nargout, "regexpi", true); 892 retval = octcellregexp (args, (nargout > 0 ? nargout : 1), "regexpi", true);
893 else 893 else
894 retval = octregexp (args, nargout, "regexpi", true); 894 retval = octregexp (args, nargout, "regexpi", true);
895 895
896 return retval; 896 return retval;
897 } 897 }