Mercurial > jwe > octave

changeset 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 e95738a119da
children 80c42f4cca13
files libinterp/corefcn/cellfun.cc libinterp/corefcn/daspk.cc libinterp/corefcn/dasrt.cc libinterp/corefcn/dassl.cc libinterp/corefcn/data.cc libinterp/corefcn/debug.cc libinterp/corefcn/graphics.cc libinterp/corefcn/graphics.in.h libinterp/corefcn/ls-mat5.cc libinterp/corefcn/lsode.cc libinterp/corefcn/mex.cc libinterp/corefcn/mxarray.in.h libinterp/corefcn/oct-stream.cc libinterp/corefcn/regexp.cc libinterp/corefcn/str2double.cc libinterp/corefcn/strfind.cc libinterp/corefcn/strfns.cc libinterp/corefcn/utils.cc libinterp/octave-value/ov-base.h libinterp/octave-value/ov-cell.cc libinterp/octave-value/ov-cell.h libinterp/octave-value/ov-class.cc libinterp/octave-value/ov-classdef.cc libinterp/octave-value/ov-java.cc libinterp/octave-value/ov-struct.cc libinterp/octave-value/ov.cc libinterp/octave-value/ov.h libinterp/octave-value/ovl.cc libinterp/parse-tree/bp-table.cc libinterp/parse-tree/oct-parse.in.yy libinterp/parse-tree/pt-cell.h libinterp/parse-tree/pt-eval.cc libinterp/parse-tree/pt-exp.h libinterp/parse-tree/pt-idx.cc libinterp/parse-tree/pt-tm-const.cc
diffstat 35 files changed, 85 insertions(+), 81 deletions(-) [+]
line wrap: on
line diff
--- a/libinterp/corefcn/cellfun.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/cellfun.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -402,7 +402,7 @@
   if (nargin < 2)
     print_usage ();
 
-  if (! args(1).is_cell ())
+  if (! args(1).iscell ())
     error ("cellfun: C must be a cell array");
 
   octave_value_list retval;
@@ -516,7 +516,7 @@
 
   for (int j = 0; j < nargin; j++)
     {
-      if (! args(j+1).is_cell ())
+      if (! args(j+1).iscell ())
         error ("cellfun: arguments must be cells");
 
       inputs[j] = args(j+1).cell_value ();
@@ -1826,7 +1826,7 @@
     retval = do_object2cell (array, dimv);
   else if (array.is_map ())
     retval = do_num2cell (array.map_value (), dimv);
-  else if (array.is_cell ())
+  else if (array.iscell ())
     retval = do_num2cell (array.cell_value (), dimv);
   else
     err_wrong_type_arg ("num2cell", array);
--- a/libinterp/corefcn/daspk.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/daspk.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -279,7 +279,7 @@
 
   octave_value f_arg = args(0);
 
-  if (f_arg.is_cell ())
+  if (f_arg.iscell ())
     {
       Cell c = f_arg.cell_value ();
       if (c.numel () == 1)
@@ -324,7 +324,7 @@
         error ("daspk: incorrect number of elements in cell array");
     }
 
-  if (! daspk_fcn && ! f_arg.is_cell ())
+  if (! daspk_fcn && ! f_arg.iscell ())
     {
       if (f_arg.is_function_handle () || f_arg.is_inline_function ())
         daspk_fcn = f_arg.function_value ();
--- a/libinterp/corefcn/dasrt.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/dasrt.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -362,7 +362,7 @@
 
   octave_value f_arg = args(0);
 
-  if (f_arg.is_cell ())
+  if (f_arg.iscell ())
     {
       Cell c = f_arg.cell_value ();
       if (c.numel () == 1)
@@ -407,7 +407,7 @@
         error ("dasrt: incorrect number of elements in cell array");
     }
 
-  if (! dasrt_f && ! f_arg.is_cell ())
+  if (! dasrt_f && ! f_arg.iscell ())
     {
       if (f_arg.is_function_handle () || f_arg.is_inline_function ())
         dasrt_f = f_arg.function_value ();
--- a/libinterp/corefcn/dassl.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/dassl.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -280,7 +280,7 @@
 
   octave_value f_arg = args(0);
 
-  if (f_arg.is_cell ())
+  if (f_arg.iscell ())
     {
       Cell c = f_arg.cell_value ();
       if (c.numel () == 1)
@@ -325,7 +325,7 @@
         error ("dassl: incorrect number of elements in cell array");
     }
 
-  if (! dassl_fcn && ! f_arg.is_cell ())
+  if (! dassl_fcn && ! f_arg.iscell ())
     {
       if (f_arg.is_function_handle () || f_arg.is_inline_function ())
         dassl_fcn = f_arg.function_value ();
--- a/libinterp/corefcn/data.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/data.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -1805,7 +1805,7 @@
             all_cmplx_p = false;
           if (! any_sparse_p && args(i).is_sparse_type ())
             any_sparse_p = true;
-          if (! any_cell_p && args(i).is_cell ())
+          if (! any_cell_p && args(i).iscell ())
             any_cell_p = true;
           if (! any_class_p && args(i).is_object ())
             any_class_p = true;
@@ -1816,7 +1816,7 @@
           int j = 0;
           for (int i = 0; i < n_args; i++)
             {
-              if (args(i).is_cell ())
+              if (args(i).iscell ())
                 args(j++) = args(i);
               else
                 {
@@ -7377,7 +7377,7 @@
                                            fval.char_array_value ()),
                                  sq_string ? '\'' : '"');
         }
-      else if (tval.is_cell () && fval.is_cell ())
+      else if (tval.iscell () && fval.iscell ())
         {
           retval = do_merge (mask,
                              tval.cell_value (),
--- a/libinterp/corefcn/debug.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/debug.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -209,7 +209,7 @@
             mv = octave_map ();
           else
             {
-              if (bkpt.is_cell () && bkpt.cell_value ().numel () > 0
+              if (bkpt.iscell () && bkpt.cell_value ().numel () > 0
                   && bkpt.cell_value () (0).is_map ())
                 mv = bkpt.cell_value () (0).map_value ();
               else
--- a/libinterp/corefcn/graphics.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/graphics.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -1749,7 +1749,7 @@
   else if (v.is_string ())
     // complete validation will be done at execution-time
     return true;
-  else if (v.is_cell () && (v.rows () == 1 || v.columns () == 1)
+  else if (v.iscell () && (v.rows () == 1 || v.columns () == 1)
            && v.cell_value ()(0).is_function_handle ())
     return true;
 
@@ -9897,7 +9897,7 @@
               octave::interpreter::recover_from_exception ();
             }
         }
-      else if (cb.is_cell () && cb.length () > 0
+      else if (cb.iscell () && cb.length () > 0
                && (cb.rows () == 1 || cb.columns () == 1)
                && (cb.cell_value ()(0).is_function ()
                    || cb.cell_value ()(0).is_function_handle ()))
@@ -10434,7 +10434,7 @@
       if (! go)
         error ("set: invalid handle (= %g)", hcv(n));
 
-      if (nargin == 3 && args(1).iscellstr () && args(2).is_cell ())
+      if (nargin == 3 && args(1).iscellstr () && args(2).iscell ())
         {
           if (args(2).cell_value ().rows () == 1)
             go.set (args(1).cellstr_value (), args(2).cell_value (), 0);
--- a/libinterp/corefcn/graphics.in.h	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/graphics.in.h	Sun Jun 11 15:35:21 2017 -0700
@@ -761,7 +761,7 @@
 
         stored_type = char_t;
       }
-    else if (val.is_cell ())
+    else if (val.iscell ())
       {
         Cell c = val.cell_value ();
 
--- a/libinterp/corefcn/ls-mat5.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/ls-mat5.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -2142,7 +2142,7 @@
                                          save_as_floats);
         }
     }
-  else if (tc.is_cell ())
+  else if (tc.iscell ())
     {
       Cell cell = tc.cell_value ();
       octave_idx_type nel = cell.numel ();
@@ -2376,7 +2376,7 @@
     }
   else if (tc.is_map ())
     flags |= MAT_FILE_STRUCT_CLASS;
-  else if (tc.is_cell ())
+  else if (tc.iscell ())
     flags |= MAT_FILE_CELL_CLASS;
   else if (tc.is_inline_function () || tc.is_object ())
     flags |= MAT_FILE_OBJECT_CLASS;
@@ -2559,7 +2559,7 @@
           write_mat5_array (os, m, save_as_floats);
         }
     }
-  else if (tc.is_cell ())
+  else if (tc.iscell ())
     {
       Cell cell = tc.cell_value ();
 
--- a/libinterp/corefcn/lsode.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/lsode.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -280,7 +280,7 @@
 
   octave_value f_arg = args(0);
 
-  if (f_arg.is_cell ())
+  if (f_arg.iscell ())
     {
       Cell c = f_arg.cell_value ();
       if (c.numel () == 1)
@@ -325,7 +325,7 @@
         error ("lsode: incorrect number of elements in cell array");
     }
 
-  if (! lsode_fcn && ! f_arg.is_cell ())
+  if (! lsode_fcn && ! f_arg.iscell ())
     {
       if (f_arg.is_function_handle () || f_arg.is_inline_function ())
         lsode_fcn = f_arg.function_value ();
--- a/libinterp/corefcn/mex.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/mex.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -214,7 +214,7 @@
 
   bool is_octave_value (void) const { return true; }
 
-  int is_cell (void) const { return val.is_cell (); }
+  int iscell (void) const { return val.iscell (); }
 
   int is_char (void) const { return val.is_string (); }
 
@@ -714,7 +714,7 @@
     mxFree (dims);
   }
 
-  int is_cell (void) const { return id == mxCELL_CLASS; }
+  int iscell (void) const { return id == mxCELL_CLASS; }
 
   int is_char (void) const { return id == mxCHAR_CLASS; }
 
@@ -2660,7 +2660,7 @@
 bool
 mxIsCell (const mxArray *ptr)
 {
-  return ptr->is_cell ();
+  return ptr->iscell ();
 }
 
 bool
--- a/libinterp/corefcn/mxarray.in.h	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/mxarray.in.h	Sun Jun 11 15:35:21 2017 -0700
@@ -143,7 +143,7 @@
 
   virtual bool is_octave_value (void) const { return false; }
 
-  virtual int is_cell (void) const = 0;
+  virtual int iscell (void) const = 0;
 
   virtual int is_char (void) const = 0;
 
@@ -368,7 +368,7 @@
 
   bool is_octave_value (void) const { return rep->is_octave_value (); }
 
-  int is_cell (void) const { return rep->is_cell (); }
+  int iscell (void) const { return rep->iscell (); }
 
   int is_char (void) const { return rep->is_char (); }
 
--- a/libinterp/corefcn/oct-stream.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/oct-stream.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -3573,7 +3573,7 @@
                 if (args(i+1).is_sq_string ())
                   delims = do_string_escapes (delims);
               }
-            else if (args(i+1).is_cell ())
+            else if (args(i+1).iscell ())
               {
                 invalid = false;
                 delim_list = args(i+1).cell_value ();
@@ -3606,7 +3606,7 @@
                 // check here for names like "C++", "C", "shell", ...?
                 comment_style = Cell (args(i+1));
               }
-            else if (args(i+1).is_cell ())
+            else if (args(i+1).iscell ())
               {
                 comment_style = args(i+1).cell_value ();
                 int len = comment_style.numel ();
@@ -3636,7 +3636,7 @@
                 treat_as_empty = Cell (args(i+1));
                 treat_as_empty_len = args(i+1).string_value ().size ();
               }
-            else if (args(i+1).is_cell ())
+            else if (args(i+1).iscell ())
               {
                 treat_as_empty = args(i+1).cell_value ();
                 for (int j = 0; j < treat_as_empty.numel (); j++)
@@ -5300,7 +5300,7 @@
         {
           octave_value val = values(i);
 
-          if (val.is_map () || val.is_cell () || val.is_object ())
+          if (val.is_map () || val.iscell () || val.is_object ())
             err_wrong_type_arg (who, val);
         }
     }
--- 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");
--- a/libinterp/corefcn/str2double.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/str2double.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -359,7 +359,7 @@
           retval = sv.map<Complex> (str2double1);
         }
     }
-  else if (args(0).is_cell ())
+  else if (args(0).iscell ())
     {
       const Cell cell = args(0).cell_value ();
 
--- a/libinterp/corefcn/strfind.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/strfind.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -228,7 +228,7 @@
                                             argstr.char_array_value (),
                                             table, overlaps),
                                  true, true);
-      else if (argstr.is_cell ())
+      else if (argstr.iscell ())
         {
           const Cell argsc = argstr.cell_value ();
           Cell retc (argsc.dims ());
@@ -254,7 +254,7 @@
       else
         error ("strfind: first argument must be a string or cell array of strings");
     }
-  else if (argpat.is_cell ())
+  else if (argpat.iscell ())
     retval = do_simple_cellfun (Fstrfind, "strfind", args);
   else
     error ("strfind: PATTERN must be a string or cell array of strings");
@@ -411,7 +411,7 @@
       if (argstr.is_string ())
         retval = qs_replace (argstr.char_array_value (), pat, rep,
                              table, overlaps);
-      else if (argstr.is_cell ())
+      else if (argstr.iscell ())
         {
           const Cell argsc = argstr.cell_value ();
           Cell retc (argsc.dims ());
@@ -432,7 +432,7 @@
       else
         error ("strrep: S must be a string or cell array of strings");
     }
-  else if (argpat.is_cell () || argrep.is_cell ())
+  else if (argpat.iscell () || argrep.iscell ())
     retval = do_simple_cellfun (Fstrrep, "strrep", args);
   else
     error ("strrep: PTN and REP arguments must be strings or cell arrays of strings");
--- a/libinterp/corefcn/strfns.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/strfns.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -324,9 +324,9 @@
   octave_value retval;
 
   bool s1_string = arg0.is_string ();
-  bool s1_cell = arg0.is_cell ();
+  bool s1_cell = arg0.iscell ();
   bool s2_string = arg1.is_string ();
-  bool s2_cell = arg1.is_cell ();
+  bool s2_cell = arg1.iscell ();
 
   if (s1_string && s2_string)
     retval = array_op (arg0.char_array_value (), arg1.char_array_value (), n);
--- a/libinterp/corefcn/utils.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/corefcn/utils.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -1443,7 +1443,7 @@
   for (int i = 0; i < nargin; i++)
     {
       octave_value arg = new_args(i);
-      iscell[i] = arg.is_cell ();
+      iscell[i] = arg.iscell ();
       if (iscell[i])
         {
           cells[i] = arg.cell_value ();
--- a/libinterp/octave-value/ov-base.h	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov-base.h	Sun Jun 11 15:35:21 2017 -0700
@@ -339,7 +339,7 @@
 
   bool is_empty (void) const { return (dims ().any_zero ()); }
 
-  virtual bool is_cell (void) const { return false; }
+  virtual bool iscell (void) const { return false; }
 
   virtual bool iscellstr (void) const { return false; }
 
--- a/libinterp/octave-value/ov-cell.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov-cell.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -83,7 +83,7 @@
                                   octave_value rhs)
 {
   // FIXME: Really?
-  if (rhs.is_cell ())
+  if (rhs.iscell ())
     matrix.assign (idx, rhs.cell_value ());
   else
     matrix.assign (idx, Cell (rhs));
@@ -332,7 +332,7 @@
       {
         octave_value_list i = idx.front ();
 
-        if (t_rhs.is_cell ())
+        if (t_rhs.iscell ())
           octave_base_matrix<Cell>::assign (i, t_rhs.cell_value ());
         else if (t_rhs.is_null_value ())
           octave_base_matrix<Cell>::delete_elements (i);
@@ -1208,7 +1208,7 @@
   if (args.length () != 1)
     print_usage ();
 
-  return ovl (args(0).is_cell ());
+  return ovl (args(0).iscell ());
 }
 
 DEFUN (cell, args, ,
--- a/libinterp/octave-value/ov-cell.h	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov-cell.h	Sun Jun 11 15:35:21 2017 -0700
@@ -117,7 +117,7 @@
 
   bool is_constant (void) const { return true; }
 
-  bool is_cell (void) const { return true; }
+  bool iscell (void) const { return true; }
 
   builtin_type_t builtin_type (void) const { return btyp_cell; }
 
--- a/libinterp/octave-value/ov-class.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov-class.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -1204,7 +1204,7 @@
           if (! is)
             break;
 
-          Cell tcell = (t2.is_cell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2));
+          Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2));
 
           m.assign (nm, tcell);
         }
@@ -1328,7 +1328,7 @@
           if (! is)
             break;
 
-          Cell tcell = (t2.is_cell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2));
+          Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2));
 
           m.assign (nm, tcell);
         }
@@ -1576,7 +1576,7 @@
     {
       octave_value t2 = dsub.tc;
 
-      Cell tcell = (t2.is_cell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2));
+      Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading class elements") : Cell (t2));
 
       m.assign (dsub.name, tcell);
 
--- a/libinterp/octave-value/ov-classdef.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov-classdef.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -364,7 +364,7 @@
             panic_impossible ();
         }
     }
-  else if (acc.is_cell ())
+  else if (acc.iscell ())
     {
       Cell acc_c = acc.cell_value ();
 
--- a/libinterp/octave-value/ov-java.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov-java.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -1858,7 +1858,7 @@
           octave_function *fcn = val.function_value ();
           octave::feval (fcn, oct_args);
         }
-      else if (val.is_cell () && val.length () > 0
+      else if (val.iscell () && val.length () > 0
                && (val.rows () == 1 || val.columns () == 1)
                && val.cell_value()(0).is_function_handle ())
         {
--- a/libinterp/octave-value/ov-struct.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov-struct.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -741,7 +741,7 @@
           if (! is)
             break;
 
-          Cell tcell = (t2.is_cell () ? t2.xcell_value ("load: internal error loading struct elements") : Cell (t2));
+          Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading struct elements") : Cell (t2));
 
           m.setfield (nm, tcell);
         }
@@ -854,7 +854,7 @@
           if (! is)
             break;
 
-          Cell tcell = (t2.is_cell () ? t2.xcell_value ("load: internal error loading struct elements") : Cell (t2));
+          Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading struct elements") : Cell (t2));
 
           m.setfield (nm, tcell);
         }
@@ -955,7 +955,7 @@
     {
       octave_value t2 = dsub.tc;
 
-      Cell tcell = (t2.is_cell () ? t2.xcell_value ("load: internal error loading struct elements") : Cell (t2));
+      Cell tcell = (t2.iscell () ? t2.xcell_value ("load: internal error loading struct elements") : Cell (t2));
 
       m.setfield (dsub.name, tcell);
 
@@ -1736,7 +1736,7 @@
 
   for (int i = 1; i < nargin; i += 2)
     {
-      if (args(i).is_cell ())
+      if (args(i).iscell ())
         {
           dim_vector argdims (args(i).dims ());
 
@@ -1775,7 +1775,7 @@
       // the cell array has already been determined to be of the
       // correct dimensions.
 
-      if (args(i+1).is_cell ())
+      if (args(i+1).iscell ())
         {
           const Cell c (args(i+1).cell_value ());
 
@@ -1880,7 +1880,7 @@
 
           retval = m.isfield (key);
         }
-      else if (args(1).is_cell ())
+      else if (args(1).iscell ())
         {
           Cell c = args(1).cell_value ();
           boolNDArray bm (c.dims ());
@@ -1966,7 +1966,7 @@
   if (nargin < 2 || nargin > 3)
     print_usage ();
 
-  if (! args(0).is_cell ())
+  if (! args(0).iscell ())
     error ("cell2struct: argument CELL must be of type cell");
 
   if (! (args(1).iscellstr () || args(1).is_char_matrix ()))
--- a/libinterp/octave-value/ov.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -2983,7 +2983,7 @@
 
       if (subs(k).is_string ())
         idx_item(0) = subs(k);
-      else if (subs(k).is_cell ())
+      else if (subs(k).iscell ())
         {
           Cell subs_cell = subs(k).cell_value ();
 
--- a/libinterp/octave-value/ov.h	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ov.h	Sun Jun 11 15:35:21 2017 -0700
@@ -528,8 +528,12 @@
   bool is_empty (void) const
   { return rep->is_empty (); }
 
+  bool iscell (void) const
+  { return rep->iscell (); }
+
+  OCTAVE_DEPRECATED ("use 'iscell' instead")
   bool is_cell (void) const
-  { return rep->is_cell (); }
+  { return rep->iscell (); }
 
   bool iscellstr (void) const
   { return rep->iscellstr (); }
--- a/libinterp/octave-value/ovl.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/octave-value/ovl.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -190,7 +190,7 @@
   octave_idx_type n = length ();
 
   for (octave_idx_type i = 0; i < n; i++)
-    if (elem (i).is_cell ())
+    if (elem (i).iscell ())
       return true;
 
   return false;
--- a/libinterp/parse-tree/bp-table.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/parse-tree/bp-table.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -255,7 +255,7 @@
       Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
       if (W.is_empty () || W(0).is_empty ())
         Vdebug_on_error = 1;    // like "dbstop if error" with no identifier
-      else if (! W(0).is_cell ())
+      else if (! W(0).iscell ())
         fail = true;
       else
         {
@@ -281,7 +281,7 @@
       Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
       if (W.is_empty () || W(0).is_empty ())
         Vdebug_on_caught = 1;    // like "dbstop if caught error" with no ID
-      else if (! W(0).is_cell ())
+      else if (! W(0).iscell ())
         fail = true;
       else
         {
@@ -307,7 +307,7 @@
       Array<octave_value> W = U.index (static_cast<octave_idx_type> (0));
       if (W.is_empty () || W(0).is_empty ())
         Vdebug_on_warning = 1;    // like "dbstop if warning" with no identifier
-      else if (! W(0).is_cell ())
+      else if (! W(0).iscell ())
         fail = true;
       else
         {
--- a/libinterp/parse-tree/oct-parse.in.yy	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/parse-tree/oct-parse.in.yy	Sun Jun 11 15:35:21 2017 -0700
@@ -911,7 +911,7 @@
 
 expression      : simple_expr
                   {
-                    if ($1 && ($1->is_matrix () || $1->is_cell ()))
+                    if ($1 && ($1->is_matrix () || $1->iscell ()))
                       {
                         if (parser.validate_array_list ($1))
                           $$ = $1;
--- a/libinterp/parse-tree/pt-cell.h	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/parse-tree/pt-cell.h	Sun Jun 11 15:35:21 2017 -0700
@@ -56,7 +56,7 @@
 
     ~tree_cell (void) = default;
 
-    bool is_cell (void) const { return true; }
+    bool iscell (void) const { return true; }
 
     bool rvalue_ok (void) const { return true; }
 
--- a/libinterp/parse-tree/pt-eval.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/parse-tree/pt-eval.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -622,7 +622,7 @@
 
     if (label_value.is_defined ())
       {
-        if (label_value.is_cell ())
+        if (label_value.iscell ())
           {
             Cell cell (label_value.cell_value ());
 
@@ -781,7 +781,7 @@
         // Maybe decrement break and continue states.
         quit_loop_now ();
       }
-    else if (rhs.is_matrix_type () || rhs.is_cell () || rhs.is_string ()
+    else if (rhs.is_matrix_type () || rhs.iscell () || rhs.is_string ()
              || rhs.is_map ())
       {
         // A matrix or cell is reshaped to 2 dimensions and iterated by
--- a/libinterp/parse-tree/pt-exp.h	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/parse-tree/pt-exp.h	Sun Jun 11 15:35:21 2017 -0700
@@ -65,7 +65,7 @@
 
     virtual bool is_matrix (void) const { return false; }
 
-    virtual bool is_cell (void) const { return false; }
+    virtual bool iscell (void) const { return false; }
 
     virtual bool is_identifier (void) const { return false; }
 
--- a/libinterp/parse-tree/pt-idx.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/parse-tree/pt-idx.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -325,7 +325,7 @@
 
               bool autoconv = (tmp.is_zero_by_zero ()
                                && (tmp.is_matrix_type () || tmp.is_string ()
-                                   || tmp.is_cell ()));
+                                   || tmp.iscell ()));
 
               if (i > 0 && type[i-1] == '(')
                 {
--- a/libinterp/parse-tree/pt-tm-const.cc	Sun Jun 11 15:26:14 2017 -0700
+++ b/libinterp/parse-tree/pt-tm-const.cc	Sun Jun 11 15:35:21 2017 -0700
@@ -82,7 +82,7 @@
             first_elem = false;
           }
       }
-    else if (val.is_cell ())
+    else if (val.iscell ())
       first_elem = false;
 
     append (val);
@@ -105,7 +105,7 @@
     if (all_cmplx && ! (val.is_complex_type () || val.is_real_type ()))
       all_cmplx = false;
 
-    if (! any_cell && val.is_cell ())
+    if (! any_cell && val.iscell ())
       any_cell = true;
 
     if (! any_sparse && val.is_sparse_type ())
@@ -199,7 +199,7 @@
       {
         octave_quit ();
 
-        if (! elt.is_cell ())
+        if (! elt.iscell ())
           {
             elt_changed = true;