Mercurial > octave

comparison libinterp/octave-value/ov-cell.cc @ 23577:80c42f4cca13

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Deprecate is_empty and replace with isempty. * ov.h (is_empty): Use OCTAVE_DEPRECATED macro around function. * ov.h (isempty): New function. * Array.h (is_empty): Use OCTAVE_DEPRECATED macro around function. * Array.h (isempty): New function. * Range.h (is_empty): Use OCTAVE_DEPRECATED macro around function. * Range.h (isempty): New function. * Sparse.h (is_empty): Use OCTAVE_DEPRECATED macro around function. * Sparse.h (isempty): New function. * Backend.cc, BaseControl.cc, Canvas.cc, Figure.cc, gl-select.cc, __magick_read__.cc, __qp__.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, det.cc, eig.cc, error.cc, fft.cc, filter.cc, find.cc, ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc, graphics.cc, graphics.in.h, hess.cc, inv.cc, lsode.cc, lu.cc, max.cc, mex.cc, mxarray.in.h, oct-handle.h, oct-lvalue.cc, oct-map.cc, oct-map.h, oct-stream.cc, pinv.cc, pr-output.cc, quadcc.cc, qz.cc, strfind.cc, strfns.cc, sylvester.cc, time.cc, toplev.cc, tril.cc, urlwrite.cc, utils.cc, utils.h, xnorm.cc, __delaunayn__.cc, __glpk__.cc, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, chol.cc, convhulln.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-sparse.cc, ov-base.cc, ov-base.h, ov-bool-mat.cc, ov-bool-sparse.cc, ov-cell.cc, ov-class.cc, ov-classdef.cc, ov-cx-sparse.cc, ov-fcn-inline.cc, ov-flt-re-mat.cc, ov-intx.h, ov-java.cc, ov-perm.cc, ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-str-mat.cc, ov-struct.cc, ov-usr-fcn.cc, ov.cc, ov.h, bp-table.cc, oct-parse.in.yy, pt-eval.cc, pt-tm-const.cc, pt-tm-const.h, Array.cc, Range.cc, Range.h, Sparse.cc, Sparse.h, chNDArray.cc, dNDArray.cc, fNDArray.cc, DASPK.cc, DASRT.cc, DASSL.cc, LSODE.cc, bsxfun-defs.cc, eigs-base.cc, oct-convn.cc, qr.cc: Replace instances of is_empty with isempty.
author Rik <rik@octave.org>
date Sun, 11 Jun 2017 22:14:09 -0700
parents 00e518162fda
children 0549061d35b9
comparison
equal deleted inserted replaced
23576:00e518162fda 23577:80c42f4cca13
248 { 248 {
249 switch (type[0]) 249 switch (type[0])
250 { 250 {
251 case '(': 251 case '(':
252 { 252 {
253 if (is_empty () && type[1] == '.') 253 if (isempty () && type[1] == '.')
254 { 254 {
255 // Allow conversion of empty cell array to some other 255 // Allow conversion of empty cell array to some other
256 // type in cases like 256 // type in cases like
257 // 257 //
258 // x = {}; x(i).f = rhs 258 // x = {}; x(i).f = rhs
309 } 309 }
310 break; 310 break;
311 311
312 case '.': 312 case '.':
313 { 313 {
314 if (! is_empty ()) 314 if (! isempty ())
315 { 315 {
316 std::string nm = type_name (); 316 std::string nm = type_name ();
317 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); 317 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
318 } 318 }
319 319
376 } 376 }
377 break; 377 break;
378 378
379 case '.': 379 case '.':
380 { 380 {
381 if (! is_empty ()) 381 if (! isempty ())
382 { 382 {
383 std::string nm = type_name (); 383 std::string nm = type_name ();
384 error ("%s cannot be indexed with %c", nm.c_str (), type[0]); 384 error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
385 } 385 }
386 386
613 Array<std::string> retval; 613 Array<std::string> retval;
614 614
615 if (! iscellstr ()) 615 if (! iscellstr ())
616 error ("invalid conversion from cell array to array of strings"); 616 error ("invalid conversion from cell array to array of strings");
617 617
618 if (cellstr_cache->is_empty ()) 618 if (cellstr_cache->isempty ())
619 *cellstr_cache = matrix.cellstr_value (); 619 *cellstr_cache = matrix.cellstr_value ();
620 620
621 return *cellstr_cache; 621 return *cellstr_cache;
622 622
623 return retval; 623 return retval;
697 { 697 {
698 bool retval = false; 698 bool retval = false;
699 699
700 indent (os); 700 indent (os);
701 701
702 if (is_empty () || ndims () > 2) 702 if (isempty () || ndims () > 2)
703 os << name << " = "; 703 os << name << " = ";
704 else 704 else
705 { 705 {
706 os << name << " ="; 706 os << name << " =";
707 newline (os); 707 newline (os);
712 } 712 }
713 713
714 void 714 void
715 octave_cell::short_disp (std::ostream& os) const 715 octave_cell::short_disp (std::ostream& os) const
716 { 716 {
717 os << (matrix.is_empty () ? "{}" : "..."); 717 os << (matrix.isempty () ? "{}" : "...");
718 } 718 }
719 719
720 #define CELL_ELT_TAG "<cell-element>" 720 #define CELL_ELT_TAG "<cell-element>"
721 721
722 bool 722 bool
1243 default: 1243 default:
1244 { 1244 {
1245 dims.resize (nargin); 1245 dims.resize (nargin);
1246 1246
1247 for (int i = 0; i < nargin; i++) 1247 for (int i = 0; i < nargin; i++)
1248 dims(i) = (args(i).is_empty () 1248 dims(i) = (args(i).isempty ()
1249 ? 0 : args(i).xidx_type_value ("cell: dimension must be a scalar integer")); 1249 ? 0 : args(i).xidx_type_value ("cell: dimension must be a scalar integer"));
1250 } 1250 }
1251 break; 1251 break;
1252 } 1252 }
1253 1253
1300 return ovl (args(0)); 1300 return ovl (args(0));
1301 else 1301 else
1302 { 1302 {
1303 string_vector s = args(0).xstring_vector_value ("cellstr: argument STRING must be a 2-D character array"); 1303 string_vector s = args(0).xstring_vector_value ("cellstr: argument STRING must be a 2-D character array");
1304 1304
1305 return ovl (s.is_empty () ? Cell (octave_value ("")) 1305 return ovl (s.isempty () ? Cell (octave_value (""))
1306 : Cell (s, true)); 1306 : Cell (s, true));
1307 } 1307 }
1308 } 1308 }
1309 1309
1310 DEFUN (struct2cell, args, , 1310 DEFUN (struct2cell, args, ,