Mercurial > octave

diff libinterp/corefcn/regexp.cc @ 23576:00e518162fda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Deprecate is_cell and replace with iscell. * ov.h (is_cell): Use OCTAVE_DEPRECATED macro around is_cell function. * ov.h (iscell): New function. * cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, graphics.cc, graphics.in.h, ls-mat5.cc, lsode.cc, mex.cc, mxarray.in.h, oct-stream.cc, regexp.cc, str2double.cc, strfind.cc, strfns.cc, utils.cc, ov-base.h, ov-cell.cc, ov-cell.h, ov-class.cc, ov-classdef.cc, ov-java.cc, ov-struct.cc, ov.cc, ovl.cc, bp-table.cc, pt-cell.h, pt-eval.cc, pt-exp.h, pt-idx.cc, pt-tm-const.cc: Replace instances of is_cell with iscell.
author Rik <rik@octave.org>
date Sun, 11 Jun 2017 15:35:21 -0700
parents 1b4f4ec53b4a
children 99a9e19bae41
line wrap: on
line diff
--- a/libinterp/corefcn/regexp.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/regexp.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -521,12 +521,12 @@
 {
   octave_value_list retval;
 
-  if (args(0).is_cell ())
+  if (args(0).iscell ())
     {
       OCTAVE_LOCAL_BUFFER (Cell, newretval, nargout);
       octave_value_list new_args = args;
       Cell cellstr = args(0).cell_value ();
-      if (args(1).is_cell ())
+      if (args(1).iscell ())
         {
           Cell cellpat = args(1).cell_value ();
 
@@ -606,7 +606,7 @@
       for (int j = 0; j < nargout; j++)
         retval(j) = octave_value (newretval[j]);
     }
-  else if (args(1).is_cell ())
+  else if (args(1).iscell ())
     {
       OCTAVE_LOCAL_BUFFER (Cell, newretval, nargout);
       octave_value_list new_args = args;
@@ -847,7 +847,7 @@
 
   octave_value_list retval;
 
-  if (args(0).is_cell () || args(1).is_cell ())
+  if (args(0).iscell () || args(1).iscell ())
     retval = (octcellregexp (args, (nargout > 0 ? nargout : 1), "regexp"));
   else
     retval = octregexp (args, nargout, "regexp");
@@ -1140,7 +1140,7 @@
   if (args.length () < 2)
     print_usage ();
 
-  if (args(0).is_cell () || args(1).is_cell ())
+  if (args(0).iscell () || args(1).iscell ())
     return octcellregexp (args, (nargout > 0 ? nargout : 1), "regexpi", true);
   else
     return octregexp (args, nargout, "regexpi", true);
@@ -1368,23 +1368,23 @@
 
   octave_value_list retval;
 
-  if (args(0).is_cell () || args(1).is_cell () || args(2).is_cell ())
+  if (args(0).iscell () || args(1).iscell () || args(2).iscell ())
     {
       Cell str, pat, rep;
       dim_vector dv0;
       dim_vector dv1 (1, 1);
 
-      if (args(0).is_cell ())
+      if (args(0).iscell ())
         str = args(0).cell_value ();
       else
         str = Cell (args(0));
 
-      if (args(1).is_cell ())
+      if (args(1).iscell ())
         pat = args(1).cell_value ();
       else
         pat = Cell (args(1));
 
-      if (args(2).is_cell ())
+      if (args(2).iscell ())
         rep = args(2).cell_value ();
       else
         rep = Cell (args(2));
@@ -1422,7 +1422,7 @@
           ret(i) = new_args(0);
         }
 
-      retval = (args(0).is_cell () ? ovl (ret) : ovl (ret(0)));
+      retval = (args(0).iscell () ? ovl (ret) : ovl (ret(0)));
     }
   else
     retval = octregexprep (args, "regexprep");