Mercurial > octave
changeset 23577:80c42f4cca13
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.
line wrap: on
line diff
--- a/libgui/graphics/Backend.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libgui/graphics/Backend.cc Sun Jun 11 22:14:09 2017 -0700 @@ -229,7 +229,7 @@ { octave_value ov = go.get (toolkitObjectProperty (go)); - if (ov.is_defined () && ! ov.is_empty ()) + if (ov.is_defined () && ! ov.isempty ()) { OCTAVE_INTPTR_TYPE ptr = ov.OCTAVE_PTR_SCALAR ().value ();
--- a/libgui/graphics/BaseControl.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libgui/graphics/BaseControl.cc Sun Jun 11 22:14:09 2017 -0700 @@ -110,7 +110,7 @@ w->setEnabled (up.enable_is ("on")); w->setToolTip (Utils::fromStdString (up.get_tooltipstring ())); w->setVisible (up.is_visible ()); - m_keyPressHandlerDefined = ! up.get_keypressfcn ().is_empty (); + m_keyPressHandlerDefined = ! up.get_keypressfcn ().isempty (); w->installEventFilter (this); @@ -168,7 +168,7 @@ break; case uicontrol::properties::ID_KEYPRESSFCN: - m_keyPressHandlerDefined = ! up.get_keypressfcn ().is_empty (); + m_keyPressHandlerDefined = ! up.get_keypressfcn ().isempty (); break; default:
--- a/libgui/graphics/Canvas.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libgui/graphics/Canvas.cc Sun Jun 11 22:14:09 2017 -0700 @@ -539,7 +539,7 @@ graphics_object figObj (obj.get_ancestor ("figure")); if (figObj.valid_object () && - ! figObj.get ("windowbuttonmotionfcn").is_empty ()) + ! figObj.get ("windowbuttonmotionfcn").isempty ()) { updateCurrentPoint (figObj, obj, event); gh_manager::post_callback (figObj.get_handle (), @@ -668,7 +668,7 @@ "windowbuttondownfcn", button_number (event)); - if (currentObj.get ("buttondownfcn").is_empty ()) + if (currentObj.get ("buttondownfcn").isempty ()) { graphics_object parentObj = gh_manager::get_object (currentObj.get_parent ());
--- a/libgui/graphics/Figure.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libgui/graphics/Figure.cc Sun Jun 11 22:14:09 2017 -0700 @@ -486,14 +486,14 @@ break; case figure::properties::ID_KEYPRESSFCN: - if (fp.get_keypressfcn ().is_empty ()) + if (fp.get_keypressfcn ().isempty ()) m_container->canvas (m_handle)->clearEventMask (Canvas::KeyPress); else m_container->canvas (m_handle)->addEventMask (Canvas::KeyPress); break; case figure::properties::ID_KEYRELEASEFCN: - if (fp.get_keyreleasefcn ().is_empty ()) + if (fp.get_keyreleasefcn ().isempty ()) m_container->canvas (m_handle)->clearEventMask (Canvas::KeyRelease); else m_container->canvas (m_handle)->addEventMask (Canvas::KeyRelease);
--- a/libgui/graphics/gl-select.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libgui/graphics/gl-select.cc Sun Jun 11 22:14:09 2017 -0700 @@ -176,7 +176,7 @@ void opengl_selector::draw_text (const text::properties& props) { - if (props.get_string ().is_empty ()) + if (props.get_string ().isempty ()) return; Matrix pos = props.get_data_position ();
--- a/libinterp/corefcn/__magick_read__.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/__magick_read__.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1125,7 +1125,7 @@ const octave_idx_type bitdepth = bitdepth_from_class<T> (); Magick::ImageType type; - const bool has_alpha = ! alpha.is_empty (); + const bool has_alpha = ! alpha.isempty (); switch (channels) { case 1: @@ -1489,7 +1489,7 @@ std::vector<Magick::Image> imvec; - if (cmap.is_empty ()) + if (cmap.isempty ()) { const octave_value alpha = options.getfield ("alpha"); if (img.is_bool_type ())
--- a/libinterp/corefcn/__qp__.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/__qp__.cc Sun Jun 11 22:14:09 2017 -0700 @@ -47,7 +47,7 @@ rank = 0; - if (! A.is_empty ()) + if (! A.isempty ()) { octave::math::svd<Matrix> A_svd (A);
--- a/libinterp/corefcn/cellfun.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/cellfun.cc Sun Jun 11 22:14:09 2017 -0700 @@ -134,7 +134,7 @@ { BNDA result (f_args.dims ()); for (octave_idx_type count = 0; count < k; count++) - result(count) = f_args.elem (count).is_empty (); + result(count) = f_args.elem (count).isempty (); retval(0) = result; } else if (name == "islogical") @@ -1651,7 +1651,7 @@ static Cell do_num2cell (const NDA& array, const Array<int>& dimv) { - if (dimv.is_empty ()) + if (dimv.isempty ()) { Cell retval (array.dims ()); octave_idx_type nel = array.numel (); @@ -1712,7 +1712,7 @@ // method is not const. octave_value array = obj; - if (! dimv.is_empty ()) + if (! dimv.isempty ()) error ("num2cell (A, dim) not implemented for class objects"); dim_vector dv = get_object_dims (array);
--- a/libinterp/corefcn/daspk.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/daspk.cc Sun Jun 11 22:14:09 2017 -0700 @@ -100,7 +100,7 @@ if (tlen > 1) ires = tmp(1).idx_type_value (); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("daspk"); } @@ -147,7 +147,7 @@ retval = tmp(0).matrix_value (); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("daspk"); }
--- a/libinterp/corefcn/dasrt.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/dasrt.cc Sun Jun 11 22:14:09 2017 -0700 @@ -95,7 +95,7 @@ retval = tmp(0).vector_value (); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("dasrt"); } @@ -136,7 +136,7 @@ retval = tmp(0).vector_value (); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("dasrt"); } @@ -183,7 +183,7 @@ retval = tmp(0).matrix_value (); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("dasrt"); }
--- a/libinterp/corefcn/dassl.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/dassl.cc Sun Jun 11 22:14:09 2017 -0700 @@ -100,7 +100,7 @@ if (tlen > 1) ires = tmp(1).int_value (); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("dassl"); } @@ -147,7 +147,7 @@ retval = tmp(0).matrix_value (); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("dassl"); }
--- a/libinterp/corefcn/data.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/data.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1733,7 +1733,7 @@ if (t1_type == dtype) tmp(j++) = elt; - else if (elt.is_object () || ! elt.is_empty ()) + else if (elt.is_object () || ! elt.isempty ()) tmp(j++) = attempt_type_conversion (elt, dtype); } @@ -1820,7 +1820,7 @@ args(j++) = args(i); else { - if (args(i).is_empty ()) + if (args(i).isempty ()) continue; // Delete empty non-cell arg else args(j++) = Cell (args(i)); @@ -3550,7 +3550,7 @@ if (args.length () != 1) print_usage (); - return ovl (args(0).is_empty ()); + return ovl (args(0).isempty ()); } /* @@ -3860,7 +3860,7 @@ dims.resize (nargin); for (int i = 0; i < nargin; i++) - dims(i) = (args(i).is_empty () + dims(i) = (args(i).isempty () ? 0 : args(i).xidx_type_value ("%s: dimension arguments must be scalar integers", fcn)); } break; @@ -3970,7 +3970,7 @@ dims.resize (nargin); for (int i = 0; i < nargin; i++) - dims(i) = (args(i).is_empty () + dims(i) = (args(i).isempty () ? 0 : args(i).xidx_type_value ("%s: dimension arguments must be scalar integers", fcn)); } break; @@ -4034,7 +4034,7 @@ dims.resize (nargin); for (int i = 0; i < nargin; i++) - dims(i) = (args(i).is_empty () + dims(i) = (args(i).isempty () ? 0 : args(i).xidx_type_value ("%s: dimension arguments must be scalar integers", fcn)); } break; @@ -4099,7 +4099,7 @@ dims.resize (nargin); for (int i = 0; i < nargin; i++) - dims(i) = (args(i).is_empty () + dims(i) = (args(i).isempty () ? 0 : args(i).xidx_type_value ("%s: dimension arguments must be scalar integers", fcn)); } break; @@ -4154,7 +4154,7 @@ dims.resize (nargin); for (int i = 0; i < nargin; i++) - dims(i) = (args(i).is_empty () + dims(i) = (args(i).isempty () ? 0 : args(i).xidx_type_value ("%s: dimension arguments must be scalar integers", fcn)); } break; @@ -5109,7 +5109,7 @@ // numeric value, the number of points defaults to 1. octave_value arg_3 = args(2); - if (arg_3.is_numeric_type () && arg_3.is_empty ()) + if (arg_3.is_numeric_type () && arg_3.isempty ()) npoints = 1; else if (! arg_3.is_scalar_type ()) error ("linspace: N must be a scalar"); @@ -5362,7 +5362,7 @@ for (int i = 1; i < nargin; i++) { - if (args(i).is_empty ()) + if (args(i).isempty ()) { if (empty_dim > 0) error ("reshape: only a single dimension can be unknown"); @@ -5618,7 +5618,7 @@ octave_value p_arg = (nargin > 1) ? args(1) : octave_value (2); - if (p_arg.is_empty ()) + if (p_arg.isempty ()) p_arg = octave_value (2); else if (p_arg.is_string ()) {
--- a/libinterp/corefcn/debug.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/debug.cc Sun Jun 11 22:14:09 2017 -0700 @@ -205,7 +205,7 @@ // Replace mv by "bkpt", to use the processing below. octave_value bkpt = mv.getfield ("bkpt"); - if (bkpt.is_empty ()) + if (bkpt.isempty ()) mv = octave_map (); else { @@ -219,7 +219,7 @@ } } } - if (mv.is_empty ()) + if (mv.isempty ()) { // no changes requested. Occurs if "errs" non-empty but "bkpt" empty } @@ -487,7 +487,7 @@ retmap.assign ("cond", cond); octave_map ew = bp_table::stop_on_err_warn_status (false); - if (ew.is_empty ()) + if (ew.isempty ()) { retval = octave_value (retmap); }
--- a/libinterp/corefcn/det.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/det.cc Sun Jun 11 22:14:09 2017 -0700 @@ -69,7 +69,7 @@ octave_value arg = args(0); - if (arg.is_empty ()) + if (arg.isempty ()) return ovl (1.0); if (arg.rows () != arg.columns ())
--- a/libinterp/corefcn/eig.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/eig.cc Sun Jun 11 22:14:09 2017 -0700 @@ -108,7 +108,7 @@ arg_a = args(0); - if (arg_a.is_empty ()) + if (arg_a.isempty ()) return octave_value_list (2, Matrix ()); if (! arg_a.is_float_type ()) @@ -124,7 +124,7 @@ { arg_b = args(1); - if (arg_b.is_empty ()) + if (arg_b.isempty ()) return octave_value_list (2, Matrix ()); if (! arg_b.is_float_type ())
--- a/libinterp/corefcn/error.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/error.cc Sun Jun 11 22:14:09 2017 -0700 @@ -903,7 +903,7 @@ { octave::execution_exception e = make_execution_exception ("error"); - if (! stack.is_empty () + if (! stack.isempty () && ! (stack.contains ("file") && stack.contains ("name") && stack.contains ("line"))) error ("rethrow: STACK struct must contain the fields 'file', 'name', and 'line'"); @@ -924,7 +924,7 @@ else rethrow_error_1 (id.c_str (), "%s", tmp_msg.c_str ()); - if (! stack.is_empty ()) + if (! stack.isempty ()) { std::ostringstream buf; @@ -997,7 +997,7 @@ if (! msg) return retval; } - else if (arg.is_empty ()) + else if (arg.isempty ()) return retval; } } @@ -1214,7 +1214,7 @@ if (nargin == 1 && args(0).is_map ()) { // empty struct is not an error. return and resume calling function. - if (args(0).is_empty ()) + if (args(0).isempty ()) return retval; octave_scalar_map m = args(0).scalar_map_value (); @@ -1906,7 +1906,7 @@ if (new_err.contains ("stack")) { - if (new_err.getfield ("stack").is_empty ()) + if (new_err.getfield ("stack").isempty ()) initialize_stack = true; else {
--- a/libinterp/corefcn/fft.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/fft.cc Sun Jun 11 22:14:09 2017 -0700 @@ -56,7 +56,7 @@ if (nargin > 1) { - if (! args(1).is_empty ()) + if (! args(1).isempty ()) { double dval = args(1).double_value (); if (octave::math::isnan (dval))
--- a/libinterp/corefcn/filter.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/filter.cc Sun Jun 11 22:14:09 2017 -0700 @@ -370,7 +370,7 @@ FloatComplexNDArray si; - if (nargin == 3 || args(3).is_empty ()) + if (nargin == 3 || args(3).isempty ()) { octave_idx_type a_len = a.numel (); octave_idx_type b_len = b.numel (); @@ -405,7 +405,7 @@ ComplexNDArray si; - if (nargin == 3 || args(3).is_empty ()) + if (nargin == 3 || args(3).isempty ()) { octave_idx_type a_len = a.numel (); octave_idx_type b_len = b.numel (); @@ -443,7 +443,7 @@ FloatNDArray si; - if (nargin == 3 || args(3).is_empty ()) + if (nargin == 3 || args(3).isempty ()) { octave_idx_type a_len = a.numel (); octave_idx_type b_len = b.numel (); @@ -478,7 +478,7 @@ NDArray si; - if (nargin == 3 || args(3).is_empty ()) + if (nargin == 3 || args(3).isempty ()) { octave_idx_type a_len = a.numel (); octave_idx_type b_len = b.numel ();
--- a/libinterp/corefcn/find.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/find.cc Sun Jun 11 22:14:09 2017 -0700 @@ -49,7 +49,7 @@ idx = nda.find (); // The maximum element is always at the end. - octave_idx_type iext = (idx.is_empty () ? 0 : idx.xelem (idx.numel () - 1) + 1); + octave_idx_type iext = (idx.isempty () ? 0 : idx.xelem (idx.numel () - 1) + 1); switch (nargout) {
--- a/libinterp/corefcn/ft-text-renderer.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/ft-text-renderer.cc Sun Jun 11 22:14:09 2017 -0700 @@ -573,7 +573,7 @@ int ft_text_renderer::compute_line_xoffset (const Matrix& lb) const { - if (! bbox.is_empty ()) + if (! bbox.isempty ()) { switch (halign) { @@ -609,7 +609,7 @@ default: for (const auto& lbox : line_bbox) { - if (bbox.is_empty ()) + if (bbox.isempty ()) bbox = lbox.extract (0, 0, 0, 3); else { @@ -1256,7 +1256,7 @@ pxls = render (elt, box, rot_mode); delete elt; - if (pxls.is_empty ()) + if (pxls.isempty ()) return; // nothing to render switch (halign)
--- a/libinterp/corefcn/gl-render.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/gl-render.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1183,7 +1183,7 @@ #if defined (HAVE_OPENGL) Matrix axe_color = props.get_color_rgb (); - if (axe_color.is_empty () || ! props.is_visible ()) + if (axe_color.isempty () || ! props.is_visible ()) return; double xPlane = props.get_xPlane (); @@ -2830,19 +2830,19 @@ Matrix mfcolor = props.get_markerfacecolor_rgb (); Matrix cc (1, 3, 0.0); - if (mecolor.is_empty () && props.markeredgecolor_is ("auto")) + if (mecolor.isempty () && props.markeredgecolor_is ("auto")) { mecolor = props.get_edgecolor_rgb (); do_edge = ! props.edgecolor_is ("none"); } - if (mfcolor.is_empty () && props.markerfacecolor_is ("auto")) + if (mfcolor.isempty () && props.markerfacecolor_is ("auto")) { mfcolor = props.get_facecolor_rgb (); do_face = ! props.facecolor_is ("none"); } - if ((mecolor.is_empty () || mfcolor.is_empty ()) && c.is_empty ()) + if ((mecolor.isempty () || mfcolor.isempty ()) && c.isempty ()) c = props.get_color_data ().array_value (); init_marker (props.get_marker (), props.get_markersize (), @@ -2861,8 +2861,8 @@ if (x_mat) j1 = j; - if ((do_edge && mecolor.is_empty ()) - || (do_face && mfcolor.is_empty ())) + if ((do_edge && mecolor.isempty ()) + || (do_face && mfcolor.isempty ())) { if (! octave::math::isfinite (c(j,i))) continue; // Skip NaNs in color data @@ -2871,9 +2871,9 @@ cc(k) = c(j,i,k); } - Matrix lc = (do_edge ? (mecolor.is_empty () ? cc : mecolor) + Matrix lc = (do_edge ? (mecolor.isempty () ? cc : mecolor) : Matrix ()); - Matrix fc = (do_face ? (mfcolor.is_empty () ? cc : mfcolor) + Matrix fc = (do_face ? (mfcolor.isempty () ? cc : mfcolor) : Matrix ()); draw_marker (x(j1,i), y(j,i1), z(j,i), lc, fc); @@ -3300,23 +3300,23 @@ bool has_markerfacecolor = false; - if ((mecolor.is_empty () && ! props.markeredgecolor_is ("none")) - || (mfcolor.is_empty () && ! props.markerfacecolor_is ("none"))) + if ((mecolor.isempty () && ! props.markeredgecolor_is ("none")) + || (mfcolor.isempty () && ! props.markerfacecolor_is ("none"))) { Matrix mc = props.get_color_data ().matrix_value (); if (mc.rows () == 1) { // Single color specifications, we can simplify a little bit - if (mfcolor.is_empty () && ! props.markerfacecolor_is ("none")) + if (mfcolor.isempty () && ! props.markerfacecolor_is ("none")) mfcolor = mc; - if (mecolor.is_empty () && ! props.markeredgecolor_is ("none")) + if (mecolor.isempty () && ! props.markeredgecolor_is ("none")) mecolor = mc; } else { - if (c.is_empty ()) + if (c.isempty ()) c = props.get_color_data ().matrix_value (); has_markerfacecolor = ((c.numel () > 0) && (c.rows () == f.rows ())); @@ -3344,9 +3344,9 @@ cc(0) = c(idx,0), cc(1) = c(idx,1), cc(2) = c(idx,2); } - Matrix lc = (do_edge ? (mecolor.is_empty () ? cc : mecolor) + Matrix lc = (do_edge ? (mecolor.isempty () ? cc : mecolor) : Matrix ()); - Matrix fc = (do_face ? (mfcolor.is_empty () ? cc : mfcolor) + Matrix fc = (do_face ? (mfcolor.isempty () ? cc : mfcolor) : Matrix ()); draw_marker (v(idx,0), v(idx,1), (has_z ? v(idx,2) : 0), lc, fc); @@ -3415,7 +3415,7 @@ { #if defined (HAVE_OPENGL) - if (props.get_string ().is_empty ()) + if (props.get_string ().isempty ()) return; set_font (props); @@ -3462,7 +3462,7 @@ Matrix y = props.get_ydata ().matrix_value (); // Someone wants us to draw an empty image? No way. - if (x.is_empty () || y.is_empty ()) + if (x.isempty () || y.isempty ()) return; if (w > 1 && x(1) == x(0))
--- a/libinterp/corefcn/gl2ps-print.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/gl2ps-print.cc Sun Jun 11 22:14:09 2017 -0700 @@ -773,7 +773,7 @@ void gl2ps_renderer::draw_text (const text::properties& props) { - if (props.get_string ().is_empty ()) + if (props.get_string ().isempty ()) return; // First set font properties: freetype will use them to compute
--- a/libinterp/corefcn/graphics.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/graphics.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1452,7 +1452,7 @@ if (itdims(i) != vdims(i)) xok = false; } - else if (v.is_empty ()) + else if (v.isempty ()) break; } } @@ -1575,7 +1575,7 @@ xmin = xminp = octave::numeric_limits<double>::Inf (); xmax = xmaxp = -octave::numeric_limits<double>::Inf (); - if (! data.is_empty ()) + if (! data.isempty ()) { if (data.is_integer_type ()) { @@ -1613,9 +1613,9 @@ handle_property::do_set (const octave_value& v) { // Users may want to use empty matrix to reset a handle property - if (v.is_empty ()) - { - if (! get ().is_empty ()) + if (v.isempty ()) + { + if (! get ().isempty ()) { current_val = graphics_handle (); return true; @@ -1742,7 +1742,7 @@ // case 4: string that can be eval()'ed // case 5: cell array with first element being a function handle - if (v.is_empty ()) + if (v.isempty ()) return true; else if (v.is_function_handle ()) return true; @@ -1779,7 +1779,7 @@ executing = true; executing_callback = true; - if (callback.is_defined () && ! callback.is_empty ()) + if (callback.is_defined () && ! callback.isempty ()) gh_manager::execute_callback (get_parent (), callback, data); } } @@ -1862,7 +1862,7 @@ retval = property (new color_property (name, h, cv, rv)); - if (args.length () > 0 && ! args(0).is_empty ()) + if (args.length () > 0 && ! args(0).isempty ()) retval.set (args(0)); else retval.set (rv.default_value ()); @@ -2717,7 +2717,7 @@ { octave_value val = xget (0, "currentfigure"); - return val.is_empty () ? octave::numeric_limits<double>::NaN () + return val.isempty () ? octave::numeric_limits<double>::NaN () : val.double_value (); } @@ -2727,7 +2727,7 @@ { octave_value val = xget (gcf (), "currentaxes"); - return val.is_empty () ? octave::numeric_limits<double>::NaN () + return val.isempty () ? octave::numeric_limits<double>::NaN () : val.double_value (); } @@ -3207,7 +3207,7 @@ void base_properties::update_uicontextmenu (void) const { - if (uicontextmenu.get ().is_empty ()) + if (uicontextmenu.get ().isempty ()) return; graphics_object go = gh_manager::get_object (uicontextmenu.get ()); @@ -5193,7 +5193,7 @@ octave_value axes::properties::get_colormap (void) const { - if (__colormap__.get ().is_empty ()) + if (__colormap__.get ().isempty ()) { graphics_object go (gh_manager::get_object (get___myhandle__ ())); graphics_object go_f (go.get_ancestor ("figure")); @@ -5911,13 +5911,13 @@ text::properties& xlabel_props = reinterpret_cast<text::properties&> (go.get_properties ()); - bool is_empty = xlabel_props.get_string ().is_empty (); + bool isempty = xlabel_props.get_string ().isempty (); octave::unwind_protect frame; frame.protect_var (updating_xlabel_position); updating_xlabel_position = true; - if (! is_empty) + if (! isempty) { if (xlabel_props.horizontalalignmentmode_is ("auto")) { @@ -5988,7 +5988,7 @@ xlabel_props.set_positionmode ("auto"); } - if (! is_empty && xlabel_props.rotationmode_is ("auto")) + if (! isempty && xlabel_props.rotationmode_is ("auto")) { xlabel_props.set_rotation (angle); xlabel_props.set_rotationmode ("auto"); @@ -6012,13 +6012,13 @@ text::properties& ylabel_props = reinterpret_cast<text::properties&> (go.get_properties ()); - bool is_empty = ylabel_props.get_string ().is_empty (); + bool isempty = ylabel_props.get_string ().isempty (); octave::unwind_protect frame; frame.protect_var (updating_ylabel_position); updating_ylabel_position = true; - if (! is_empty) + if (! isempty) { if (ylabel_props.horizontalalignmentmode_is ("auto")) { @@ -6098,7 +6098,7 @@ ylabel_props.set_positionmode ("auto"); } - if (! is_empty && ylabel_props.rotationmode_is ("auto")) + if (! isempty && ylabel_props.rotationmode_is ("auto")) { ylabel_props.set_rotation (angle); ylabel_props.set_rotationmode ("auto"); @@ -6123,13 +6123,13 @@ = reinterpret_cast<text::properties&> (go.get_properties ()); bool camAuto = cameraupvectormode_is ("auto"); - bool is_empty = zlabel_props.get_string ().is_empty (); + bool isempty = zlabel_props.get_string ().isempty (); octave::unwind_protect frame; frame.protect_var (updating_zlabel_position); updating_zlabel_position = true; - if (! is_empty) + if (! isempty) { if (zlabel_props.horizontalalignmentmode_is ("auto")) { @@ -6222,7 +6222,7 @@ zlabel_props.set_positionmode ("auto"); } - if (! is_empty && zlabel_props.rotationmode_is ("auto")) + if (! isempty && zlabel_props.rotationmode_is ("auto")) { zlabel_props.set_rotation (angle); zlabel_props.set_rotationmode ("auto"); @@ -6494,7 +6494,7 @@ : get_outerposition ().matrix_value ()); Matrix parent_size (parent_pix_size); - if (parent_size.is_empty ()) + if (parent_size.isempty ()) { graphics_object go = gh_manager::get_object (get_parent ()); @@ -6555,7 +6555,7 @@ Matrix text_pos = text_props.get_data_position (); text_pos = xform.transform (text_pos(0), text_pos(1), text_pos(2)); - if (text_props.get_string ().is_empty ()) + if (text_props.get_string ().isempty ()) { ext(0) = std::min (ext(0), text_pos(0)); ext(1) = std::min (ext(1), text_pos(1)); @@ -7091,7 +7091,7 @@ { // FIXME: add log ticks and lims - if (lims.get ().is_empty ()) + if (lims.get ().isempty ()) return; double lo = (lims.get ().matrix_value ())(0); @@ -8469,7 +8469,7 @@ patch::properties::get_color_data (void) const { octave_value fvc = get_facevertexcdata (); - if (fvc.is_undefined () || fvc.is_empty ()) + if (fvc.is_undefined () || fvc.isempty ()) return Matrix (); else return convert_cdata (*this, fvc, cdatamapping_is ("scaled"), 2); @@ -8490,7 +8490,7 @@ bad_data_msg = ""; if (xd.dims () != yd.dims () - || (xd.dims () != zd.dims () && ! zd.is_empty ())) + || (xd.dims () != zd.dims () && ! zd.isempty ())) { bad_data_msg = "x/y/zdata must have the same dimensions"; return; @@ -8511,7 +8511,7 @@ } dv(0) = nr * nc; - if (zd.is_empty ()) + if (zd.isempty ()) dv(1) = 2; else { @@ -8615,7 +8615,7 @@ } else { - if (! fvc.is_empty ()) + if (! fvc.isempty ()) { dv(0) = idx.rows (); dv(1) = nfaces; @@ -9114,7 +9114,7 @@ void uicontrol::properties::set_style (const octave_value& st) { - if (! get___object__ ().is_empty ()) + if (! get___object__ ().isempty ()) error ("set: cannot change the style of a uicontrol object after creation."); style = st; @@ -9135,7 +9135,7 @@ Matrix pos = get_position ().matrix_value (); Matrix parent_size (parent_pix_size); - if (parent_size.is_empty ()) + if (parent_size.isempty ()) { graphics_object go = gh_manager::get_object (get_parent ()); @@ -9200,7 +9200,7 @@ Matrix pos = get_position ().matrix_value (); Matrix parent_size (parent_pix_size); - if (parent_size.is_empty ()) + if (parent_size.isempty ()) { graphics_object go = gh_manager::get_object (get_parent ()); @@ -9328,7 +9328,7 @@ { graphics_handle current_selectedobject = get_selectedobject(); selectedobject = current_selectedobject; - if (v.is_empty ()) + if (v.isempty ()) { if (current_selectedobject.ok ()) { @@ -9371,7 +9371,7 @@ Matrix pos = get_position ().matrix_value (); Matrix parent_size (parent_pix_size); - if (parent_size.is_empty ()) + if (parent_size.isempty ()) { graphics_object go = gh_manager::get_object (get_parent ()); @@ -9852,7 +9852,7 @@ const octave_value& cb_arg, const octave_value& data) { - if (cb_arg.is_defined () && ! cb_arg.is_empty ()) + if (cb_arg.is_defined () && ! cb_arg.isempty ()) { octave_value_list args; octave_function *fcn = nullptr; @@ -10534,7 +10534,7 @@ if (nargin < 1 || nargin > 2) print_usage (); - if (args(0).is_empty ()) + if (args(0).isempty ()) return ovl (Matrix ()); ColumnVector hcv = args(0).xvector_value ("get: H must be a graphics handle"); @@ -10849,7 +10849,7 @@ if (go.isa ("surface")) nd = 3; else if ((go.isa ("line") || go.isa ("patch")) - && ! go.get ("zdata").is_empty ()) + && ! go.get ("zdata").isempty ()) nd = 3; else { @@ -11848,7 +11848,7 @@ print_usage (); // return immediately if the graphics handle is invalid - if (args(0).is_empty ()) + if (args(0).isempty ()) return ovl (); double h = args(0).xdouble_value ("waitfor: invalid handle value");
--- a/libinterp/corefcn/graphics.in.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/graphics.in.h Sun Jun 11 22:14:09 2017 -0700 @@ -721,7 +721,7 @@ bool empty (void) const { octave_value tmp = get (); - return tmp.is_empty (); + return tmp.isempty (); } octave_value get (void) const @@ -1902,7 +1902,7 @@ bool is_defined (void) const { - return (callback.is_defined () && ! callback.is_empty ()); + return (callback.is_defined () && ! callback.isempty ()); } callback_property& operator = (const octave_value& val) @@ -4429,7 +4429,7 @@ void fix_limits (array_property& lims) { - if (lims.get ().is_empty ()) + if (lims.get ().isempty ()) return; Matrix l = lims.get ().matrix_value (); @@ -4979,7 +4979,7 @@ void update_xdata (void) { - if (xdata.get ().is_empty ()) + if (xdata.get ().isempty ()) set_xdatamode ("auto"); if (xdatamode.is ("auto")) @@ -4998,7 +4998,7 @@ void update_ydata (void) { - if (ydata.get ().is_empty ()) + if (ydata.get ().isempty ()) set_ydatamode ("auto"); if (ydatamode.is ("auto")) @@ -5273,7 +5273,7 @@ void update_xdata (void) { - if (get_xdata ().is_empty ()) + if (get_xdata ().isempty ()) { // For compatibility with matlab behavior, // if x/ydata are set empty, silently empty other *data and @@ -5291,7 +5291,7 @@ void update_ydata (void) { - if (get_ydata ().is_empty ()) + if (get_ydata ().isempty ()) { set_xdata (Matrix ()); set_zdata (Matrix ());
--- a/libinterp/corefcn/hess.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/hess.cc Sun Jun 11 22:14:09 2017 -0700 @@ -65,7 +65,7 @@ octave_value arg = args(0); - if (arg.is_empty ()) + if (arg.isempty ()) return octave_value_list (2, Matrix ()); if (arg.rows () != arg.columns ())
--- a/libinterp/corefcn/inv.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/inv.cc Sun Jun 11 22:14:09 2017 -0700 @@ -62,7 +62,7 @@ octave_value arg = args(0); - if (arg.is_empty ()) + if (arg.isempty ()) return ovl (Matrix ()); if (arg.rows () != arg.columns ())
--- a/libinterp/corefcn/lsode.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/lsode.cc Sun Jun 11 22:14:09 2017 -0700 @@ -93,7 +93,7 @@ retval = tmp(0).xvector_value ("lsode: expecting user supplied function to return numeric vector"); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("lsode"); } @@ -133,7 +133,7 @@ retval = tmp(0).xmatrix_value ("lsode: expecting user supplied jacobian function to return numeric array"); - if (retval.is_empty ()) + if (retval.isempty ()) err_user_supplied_eval ("lsode"); }
--- a/libinterp/corefcn/lu.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/lu.cc Sun Jun 11 22:14:09 2017 -0700 @@ -187,7 +187,7 @@ if (issparse) { - if (arg.is_empty ()) + if (arg.isempty ()) return octave_value_list (5, SparseMatrix ()); if (arg.is_real_type ()) @@ -327,7 +327,7 @@ } else { - if (arg.is_empty ()) + if (arg.isempty ()) return octave_value_list (3, Matrix ()); if (arg.is_real_type ())
--- a/libinterp/corefcn/max.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/max.cc Sun Jun 11 22:14:09 2017 -0700 @@ -122,7 +122,7 @@ // This case can be handled using any/all. boolNDArray array = arg.bool_array_value (); - if (array.is_empty ()) + if (array.isempty ()) retval(0) = array; else if (ismin) retval(0) = array.all (dim); @@ -256,7 +256,7 @@ if (dim < 0) error ("%s: DIM must be a valid dimension", func); - if (! args(1).is_empty ()) + if (! args(1).isempty ()) warning ("%s: second argument is ignored", func); }
--- a/libinterp/corefcn/mex.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/mex.cc Sun Jun 11 22:14:09 2017 -0700 @@ -313,7 +313,7 @@ mwSize get_number_of_elements (void) const { return val.numel (); } - int is_empty (void) const { return val.is_empty (); } + int isempty (void) const { return val.isempty (); } bool is_scalar (void) const { @@ -819,7 +819,7 @@ return retval; } - int is_empty (void) const { return get_number_of_elements () == 0; } + int isempty (void) const { return get_number_of_elements () == 0; } bool is_scalar (void) const { @@ -2789,7 +2789,7 @@ bool mxIsEmpty (const mxArray *ptr) { - return ptr->is_empty (); + return ptr->isempty (); } bool
--- a/libinterp/corefcn/mxarray.in.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/mxarray.in.h Sun Jun 11 22:14:09 2017 -0700 @@ -214,7 +214,7 @@ virtual mwSize get_number_of_elements (void) const = 0; - virtual int is_empty (void) const = 0; + virtual int isempty (void) const = 0; virtual bool is_scalar (void) const = 0; @@ -430,7 +430,7 @@ mwSize get_number_of_elements (void) const { return rep->get_number_of_elements (); } - int is_empty (void) const { return get_number_of_elements () == 0; } + int isempty (void) const { return get_number_of_elements () == 0; } bool is_scalar (void) const { return rep->is_scalar (); }
--- a/libinterp/corefcn/oct-handle.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/oct-handle.h Sun Jun 11 22:14:09 2017 -0700 @@ -40,7 +40,7 @@ octave_handle (const octave_value& a) : val (octave::numeric_limits<double>::NaN ()) { - if (a.is_empty ()) + if (a.isempty ()) ; // do nothing else {
--- a/libinterp/corefcn/oct-lvalue.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/oct-lvalue.cc Sun Jun 11 22:14:09 2017 -0700 @@ -61,7 +61,7 @@ { octave_value_list tmp = idx.front (); - retval = (tmp.length () == 1 && tmp(0).is_empty ()); + retval = (tmp.length () == 1 && tmp(0).isempty ()); } return retval;
--- a/libinterp/corefcn/oct-map.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/oct-map.cc Sun Jun 11 22:14:09 2017 -0700 @@ -624,7 +624,7 @@ void permute_to_correct_order1 (const octave_map& ref, const octave_map& src, octave_map& dest, Array<octave_idx_type>& perm) { - if (src.nfields () == 0 && src.is_empty ()) + if (src.nfields () == 0 && src.isempty ()) dest = octave_map (src.dims (), ref.keys ()); else dest = src.orderfields (ref, perm);
--- a/libinterp/corefcn/oct-map.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/oct-map.h Sun Jun 11 22:14:09 2017 -0700 @@ -370,7 +370,7 @@ // The Array-like methods. octave_idx_type numel (void) const { return dimensions.numel (); } octave_idx_type length (void) const { return numel (); } - bool is_empty (void) const { return dimensions.any_zero (); } + bool isempty (void) const { return dimensions.any_zero (); } octave_idx_type rows (void) const { return dimensions(0); } octave_idx_type cols (void) const { return dimensions(1); }
--- a/libinterp/corefcn/oct-stream.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/oct-stream.cc Sun Jun 11 22:14:09 2017 -0700 @@ -3161,7 +3161,7 @@ textscan::scan_string (delimited_stream& is, const textscan_format_elt& fmt, std::string& val) const { - if (delim_list.is_empty ()) + if (delim_list.isempty ()) { unsigned int i = 0; unsigned int width = fmt.width; @@ -5813,7 +5813,7 @@ if (val_cache) { - if (! val.is_empty ()) + if (! val.isempty ()) retval += do_numeric_printf_conv (os, elt, nsa, sa_1, sa_2, val, who); }
--- a/libinterp/corefcn/pinv.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/pinv.cc Sun Jun 11 22:14:09 2017 -0700 @@ -60,7 +60,7 @@ octave_value arg = args(0); - if (arg.is_empty ()) + if (arg.isempty ()) return ovl (Matrix ()); octave_value retval;
--- a/libinterp/corefcn/pr-output.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/pr-output.cc Sun Jun 11 22:14:09 2017 -0700 @@ -2005,7 +2005,7 @@ bool pr_as_read_syntax) { - if (nda.is_empty ()) + if (nda.isempty ()) print_empty_nd_array (os, nda.dims (), pr_as_read_syntax); else { @@ -2865,7 +2865,7 @@ // FIXME: this mostly duplicates the code in the print_nd_array<> // function. Can fix this with std::is_same from C++11. - if (nda.is_empty ()) + if (nda.isempty ()) print_empty_nd_array (os, nda.dims (), pr_as_read_syntax); else if (nda.numel () == 1) { @@ -3134,7 +3134,7 @@ // FIXME: this mostly duplicates the code in the print_nd_array<> // function. Can fix this with std::is_same from C++11. - if (nda.is_empty ()) + if (nda.isempty ()) print_empty_nd_array (os, nda.dims (), pr_as_read_syntax); else if (nda.numel () == 1) octave_print_internal_template (os, nda(0), pr_as_read_syntax);
--- a/libinterp/corefcn/quadcc.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/quadcc.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1602,7 +1602,7 @@ else b = args(2).double_value (); - if (nargin < 4 || args(3).is_empty ()) + if (nargin < 4 || args(3).isempty ()) tol = 1.0e-6; else if (! args(3).is_real_scalar () || args(3).double_value () <= 0) error ("quadcc: tolerance (TOL) must be a single real scalar > 0");
--- a/libinterp/corefcn/qz.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/qz.cc Sun Jun 11 22:14:09 2017 -0700 @@ -313,7 +313,7 @@ std::cout << "Matrix A dimensions: (" << nn << "," << nc << ")" << std::endl; #endif - if (args(0).is_empty ()) + if (args(0).isempty ()) { warn_empty_arg ("qz: A"); return octave_value_list (2, Matrix ());
--- a/libinterp/corefcn/strfind.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/strfind.cc Sun Jun 11 22:14:09 2017 -0700 @@ -220,7 +220,7 @@ qs_preprocess (needle, table); if (argstr.is_string ()) - if (argpat.is_empty ()) + if (argpat.isempty ()) // Return a null matrix for null pattern for MW compatibility retval = Matrix (); else @@ -240,7 +240,7 @@ if (! argse.is_string ()) error ("strfind: each element of CELLSTR must be a string"); - if (argpat.is_empty ()) + if (argpat.isempty ()) retc(i) = Matrix (); else retc(i) = octave_value (qs_search (needle,
--- a/libinterp/corefcn/strfns.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/strfns.cc Sun Jun 11 22:14:09 2017 -0700 @@ -871,7 +871,7 @@ int width = -1; - if (nargin > 1 && ! args(1).is_empty ()) + if (nargin > 1 && ! args(1).isempty ()) width = args(1).xint_value ("list_in_columns: WIDTH must be an integer"); std::string prefix;
--- a/libinterp/corefcn/sylvester.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/sylvester.cc Sun Jun 11 22:14:09 2017 -0700 @@ -81,7 +81,7 @@ || arg_b.is_single_type () || arg_c.is_single_type (); - if (arg_a.is_empty () || arg_b.is_empty () || arg_c.is_empty ()) + if (arg_a.isempty () || arg_b.isempty () || arg_c.isempty ()) { if (isfloat) return ovl (FloatMatrix ());
--- a/libinterp/corefcn/time.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/time.cc Sun Jun 11 22:14:09 2017 -0700 @@ -63,7 +63,7 @@ octave_value v = m.getfield (k); - if (! v.is_empty ()) + if (! v.isempty ()) retval = v.xint_value ("%s: invalid TM_STRUCT argument", who); return retval; @@ -76,7 +76,7 @@ octave_value v = m.getfield (k); - if (! v.is_empty ()) + if (! v.isempty ()) retval = v.xstring_value ("%s: invalid TM_STRUCT argument", who); return retval;
--- a/libinterp/corefcn/toplev.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/toplev.cc Sun Jun 11 22:14:09 2017 -0700 @@ -287,7 +287,7 @@ { Cell c = m.contents (key); - if (! c.is_empty ()) + if (! c.isempty ()) return c(0); }
--- a/libinterp/corefcn/tril.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/tril.cc Sun Jun 11 22:14:09 2017 -0700 @@ -265,7 +265,7 @@ name.c_str (), arg.class_name ().c_str ()); octave_value tmp = arg; - if (arg.is_empty ()) + if (arg.isempty ()) return arg; octave_idx_type nr = dims(0);
--- a/libinterp/corefcn/urlwrite.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/urlwrite.cc Sun Jun 11 22:14:09 2017 -0700 @@ -868,7 +868,7 @@ std::string target; - if (nargin == 3 && ! args(2).is_empty ()) + if (nargin == 3 && ! args(2).isempty ()) target = args(2).xstring_value ("__ftp_mget__: TARGET must be a string") + octave::sys::file_ops::dir_sep_str (); octave::url_transfer curl = ch_manager::get_object (args(0));
--- a/libinterp/corefcn/utils.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/utils.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1199,9 +1199,9 @@ get_dimensions (const octave_value& a, const octave_value& b, const char *warn_for, octave_idx_type& nr, octave_idx_type& nc) { - nr = a.is_empty () + nr = a.isempty () ? 0 : a.idx_type_value ("%s: row dimension must be a scalar", warn_for); - nc = b.is_empty () + nc = b.isempty () ? 0 : b.idx_type_value ("%s: column dimension must be a scalar", warn_for); check_dimensions (nr, nc, warn_for);
--- a/libinterp/corefcn/utils.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/utils.h Sun Jun 11 22:14:09 2017 -0700 @@ -54,7 +54,7 @@ const std::string& s, int min_toks_to_match, int max_toks); -OCTAVE_DEPRECATED ("use 'octave_value::is_empty' instead") +OCTAVE_DEPRECATED ("use 'octave_value::isempty' instead") extern OCTINTERP_API int empty_arg (const char *name, octave_idx_type nr, octave_idx_type nc);
--- a/libinterp/corefcn/xnorm.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/corefcn/xnorm.cc Sun Jun 11 22:14:09 2017 -0700 @@ -44,7 +44,7 @@ if (! isfloat && ! x.is_double_type ()) err_wrong_type_arg ("xnorm", x); - if (x.is_empty ()) + if (x.isempty ()) retval = octave_value (0); else if (isvector) {
--- a/libinterp/dldfcn/__delaunayn__.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/dldfcn/__delaunayn__.cc Sun Jun 11 22:14:09 2017 -0700 @@ -125,7 +125,7 @@ { if (args(1).is_string ()) options = args(1).string_value (); - else if (args(1).is_empty ()) + else if (args(1).isempty ()) ; // Use default options else if (args(1).iscellstr ()) {
--- a/libinterp/dldfcn/__glpk__.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/dldfcn/__glpk__.cc Sun Jun 11 22:14:09 2017 -0700 @@ -309,7 +309,7 @@ \ if (tmp.is_defined ()) \ { \ - if (! tmp.is_empty ()) \ + if (! tmp.isempty ()) \ VAL = tmp.xscalar_value ("glpk: invalid value in PARAM" NAME); \ else \ error ("glpk: invalid value in PARAM" NAME); \ @@ -324,7 +324,7 @@ \ if (tmp.is_defined ()) \ { \ - if (! tmp.is_empty ()) \ + if (! tmp.isempty ()) \ VAL = tmp.xint_value ("glpk: invalid value in PARAM" NAME); \ else \ error ("glpk: invalid value in PARAM" NAME); \
--- a/libinterp/dldfcn/__init_fltk__.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/dldfcn/__init_fltk__.cc Sun Jun 11 22:14:09 2017 -0700 @@ -481,7 +481,7 @@ = const_cast<Fl_Menu_Item *> (m_menubar->find_item (fltk_label.c_str ())); if (item) { - if (! uimenup.get_callback ().is_empty ()) + if (! uimenup.get_callback ().isempty ()) item->callback (static_cast<Fl_Callback *> (script_cb), static_cast<void *> (&uimenup)); else @@ -1519,7 +1519,7 @@ m_fp.set_currentcharacter (std::string (e_text)); - if (! m_fp.get_keypressfcn ().is_empty () + if (! m_fp.get_keypressfcn ().isempty () && (evt.contents ("Key").length () > 0)) { // Update CurrentPoint before callback @@ -1593,7 +1593,7 @@ evt = format_key_event (e_key, e_text, e_state); } - if (! m_fp.get_keyreleasefcn ().is_empty () + if (! m_fp.get_keyreleasefcn ().isempty () && (evt.contents ("Key").length () > 0)) m_fp.execute_keyreleasefcn (evt); return 1; @@ -1640,7 +1640,7 @@ // Ensure windowbuttondownfcn is called after currentpoint // is updated but before calling buttondownfcn. - if (! m_fp.get_windowbuttondownfcn ().is_empty ()) + if (! m_fp.get_windowbuttondownfcn ().isempty ()) m_fp.execute_windowbuttondownfcn (Fl::event_button ()); if (gh.ok ()) @@ -1655,18 +1655,18 @@ m_fp.set_currentobject (m_ax_obj.get_handle ().value ()); base_properties& props = m_ax_obj.get_properties (); - if (! props.get_buttondownfcn ().is_empty ()) + if (! props.get_buttondownfcn ().isempty ()) props.execute_buttondownfcn (Fl::event_button ()); return 1; } - else if (! m_fp.get_buttondownfcn ().is_empty ()) + else if (! m_fp.get_buttondownfcn ().isempty ()) m_fp.execute_buttondownfcn (Fl::event_button ()); break; case FL_DRAG: - if (! m_fp.get_windowbuttonmotionfcn ().is_empty ()) + if (! m_fp.get_windowbuttonmotionfcn ().isempty ()) { set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ()); m_fp.execute_windowbuttonmotionfcn (); @@ -1779,7 +1779,7 @@ } case FL_RELEASE: - if (! m_fp.get_windowbuttonupfcn ().is_empty ()) + if (! m_fp.get_windowbuttonupfcn ().isempty ()) { set_currentpoint (Fl::event_x (), Fl::event_y () - menu_dy ()); m_fp.execute_windowbuttonupfcn (); @@ -2279,7 +2279,7 @@ { octave_value ov = go.get (caseless_str ("__plot_stream__")); - if (! ov.is_empty ()) + if (! ov.isempty ()) figure_manager::delete_window (ov.string_value ()); } } @@ -2312,7 +2312,7 @@ { octave_value ov = go.get (caseless_str ("__plot_stream__")); - if (! ov.is_empty ()) + if (! ov.isempty ()) { const figure::properties& fp = dynamic_cast<const figure::properties&> (go.get_properties ());
--- a/libinterp/dldfcn/__init_gnuplot__.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Sun Jun 11 22:14:09 2017 -0700 @@ -151,7 +151,7 @@ void send_quit (const octave_value& pstream) const { - if (! pstream.is_empty ()) + if (! pstream.isempty ()) { octave_value_list args; Matrix fids = pstream.matrix_value ();
--- a/libinterp/dldfcn/__ode15__.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/dldfcn/__ode15__.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1048,7 +1048,7 @@ dae.set_maxstep (maxstep); //Set initial step - if (! options.getfield("InitialStep").is_empty ()) + if (! options.getfield("InitialStep").isempty ()) { realtype initialstep = options.getfield("InitialStep").double_value ();
--- a/libinterp/dldfcn/__voronoi__.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/dldfcn/__voronoi__.cc Sun Jun 11 22:14:09 2017 -0700 @@ -124,7 +124,7 @@ if (opt_arg.is_string ()) options = " " + opt_arg.string_value (); - else if (opt_arg.is_empty ()) + else if (opt_arg.isempty ()) ; // Use default options. else if (opt_arg.iscellstr ()) {
--- a/libinterp/dldfcn/chol.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/dldfcn/chol.cc Sun Jun 11 22:14:09 2017 -0700 @@ -176,7 +176,7 @@ octave_value_list retval; octave_value arg = args(0); - if (arg.is_empty ()) + if (arg.isempty ()) return ovl (Matrix ()); if (arg.is_sparse_type ())
--- a/libinterp/dldfcn/convhulln.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/dldfcn/convhulln.cc Sun Jun 11 22:14:09 2017 -0700 @@ -141,7 +141,7 @@ { if (args(1).is_string ()) options = " " + args(1).string_value (); - else if (args(1).is_empty ()) + else if (args(1).isempty ()) ; // Use default options. else if (args(1).iscellstr ()) {
--- a/libinterp/octave-value/ov-base-diag.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-base-diag.cc Sun Jun 11 22:14:09 2017 -0700 @@ -236,7 +236,7 @@ case '{': case '.': { - if (! is_empty ()) + if (! isempty ()) { std::string nm = type_name (); error ("%s cannot be indexed with %c", nm.c_str (), type[0]); @@ -306,7 +306,7 @@ warn_implicit_conversion ("Octave:imag-to-real", "complex matrix", "real scalar"); - if (is_empty ()) + if (isempty ()) err_invalid_conversion (type_name (), "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar",
--- a/libinterp/octave-value/ov-base-mat.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-base-mat.cc Sun Jun 11 22:14:09 2017 -0700 @@ -80,7 +80,7 @@ { if (type.length () == 1) retval = numeric_assign (type, idx, rhs); - else if (is_empty ()) + else if (isempty ()) { // Allow conversion of empty matrix to some other type in // cases like @@ -106,7 +106,7 @@ case '{': case '.': { - if (! is_empty ()) + if (! isempty ()) { std::string nm = type_name (); error ("%s cannot be indexed with %c", nm.c_str (), type[0]); @@ -458,7 +458,7 @@ void octave_base_matrix<MT>::short_disp (std::ostream& os) const { - if (matrix.is_empty ()) + if (matrix.isempty ()) os << "[]"; else if (matrix.ndims () == 2) {
--- a/libinterp/octave-value/ov-base-sparse.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-base-sparse.cc Sun Jun 11 22:14:09 2017 -0700 @@ -157,7 +157,7 @@ case '{': case '.': { - if (! is_empty ()) + if (! isempty ()) { std::string nm = type_name (); error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
--- a/libinterp/octave-value/ov-base.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-base.cc Sun Jun 11 22:14:09 2017 -0700 @@ -96,7 +96,7 @@ { static string_vector retval; - if (retval.is_empty ()) + if (retval.isempty ()) { int n = btyp_num_types - 2; retval = string_vector (n); @@ -274,7 +274,7 @@ { if (type.length () == 1) retval = numeric_assign (type, idx, rhs); - else if (is_empty ()) + else if (isempty ()) { // Allow conversion of empty matrix to some other // type in cases like
--- a/libinterp/octave-value/ov-base.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-base.h Sun Jun 11 22:14:09 2017 -0700 @@ -337,7 +337,7 @@ virtual bool is_defined (void) const { return false; } - bool is_empty (void) const { return (dims ().any_zero ()); } + bool isempty (void) const { return (dims ().any_zero ()); } virtual bool iscell (void) const { return false; }
--- a/libinterp/octave-value/ov-bool-mat.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-bool-mat.cc Sun Jun 11 22:14:09 2017 -0700 @@ -292,7 +292,7 @@ boolNDArray btmp (dv); - if (btmp.is_empty ()) + if (btmp.isempty ()) matrix = btmp; else {
--- a/libinterp/octave-value/ov-bool-sparse.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-bool-sparse.cc Sun Jun 11 22:14:09 2017 -0700 @@ -100,7 +100,7 @@ double octave_sparse_bool_matrix::double_value (bool) const { - if (is_empty ()) + if (isempty ()) err_invalid_conversion ("bool sparse matrix", "real scalar"); if (numel () > 1)
--- a/libinterp/octave-value/ov-cell.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-cell.cc Sun Jun 11 22:14:09 2017 -0700 @@ -250,7 +250,7 @@ { case '(': { - if (is_empty () && type[1] == '.') + if (isempty () && type[1] == '.') { // Allow conversion of empty cell array to some other // type in cases like @@ -311,7 +311,7 @@ case '.': { - if (! is_empty ()) + if (! isempty ()) { std::string nm = type_name (); error ("%s cannot be indexed with %c", nm.c_str (), type[0]); @@ -378,7 +378,7 @@ case '.': { - if (! is_empty ()) + if (! isempty ()) { std::string nm = type_name (); error ("%s cannot be indexed with %c", nm.c_str (), type[0]); @@ -615,7 +615,7 @@ if (! iscellstr ()) error ("invalid conversion from cell array to array of strings"); - if (cellstr_cache->is_empty ()) + if (cellstr_cache->isempty ()) *cellstr_cache = matrix.cellstr_value (); return *cellstr_cache; @@ -699,7 +699,7 @@ indent (os); - if (is_empty () || ndims () > 2) + if (isempty () || ndims () > 2) os << name << " = "; else { @@ -714,7 +714,7 @@ void octave_cell::short_disp (std::ostream& os) const { - os << (matrix.is_empty () ? "{}" : "..."); + os << (matrix.isempty () ? "{}" : "..."); } #define CELL_ELT_TAG "<cell-element>" @@ -1245,7 +1245,7 @@ dims.resize (nargin); for (int i = 0; i < nargin; i++) - dims(i) = (args(i).is_empty () + dims(i) = (args(i).isempty () ? 0 : args(i).xidx_type_value ("cell: dimension must be a scalar integer")); } break; @@ -1302,7 +1302,7 @@ { string_vector s = args(0).xstring_vector_value ("cellstr: argument STRING must be a 2-D character array"); - return ovl (s.is_empty () ? Cell (octave_value ("")) + return ovl (s.isempty () ? Cell (octave_value ("")) : Cell (s, true)); } }
--- a/libinterp/octave-value/ov-class.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-class.cc Sun Jun 11 22:14:09 2017 -0700 @@ -740,7 +740,7 @@ } else { - if (! t_rhs.is_empty ()) + if (! t_rhs.isempty ()) error ("invalid class assignment"); map.delete_elements (idx.front ());
--- a/libinterp/octave-value/ov-classdef.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-classdef.cc Sun Jun 11 22:14:09 2017 -0700 @@ -741,9 +741,9 @@ std::string class_name = cls.get_name (); - if (! get_method.is_empty ()) + if (! get_method.isempty ()) make_function_of_class (class_name, get_method); - if (! set_method.is_empty ()) + if (! set_method.isempty ()) make_function_of_class (class_name, set_method); return prop; @@ -2828,7 +2828,7 @@ // FIXME: should check whether we're already in get accessor method - if (get_fcn.is_empty () || is_method_executing (get_fcn, obj)) + if (get_fcn.isempty () || is_method_executing (get_fcn, obj)) retval = obj.get (get ("Name").string_value ()); else { @@ -2881,7 +2881,7 @@ octave_value set_fcn = get ("SetMethod"); - if (set_fcn.is_empty () || is_method_executing (set_fcn, obj)) + if (set_fcn.isempty () || is_method_executing (set_fcn, obj)) obj.put (get ("Name").string_value (), val); else {
--- a/libinterp/octave-value/ov-cx-sparse.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-cx-sparse.cc Sun Jun 11 22:14:09 2017 -0700 @@ -111,7 +111,7 @@ "complex sparse matrix", "real scalar"); // FIXME: maybe this should be a function, valid_as_scalar() - if (is_empty ()) + if (isempty ()) err_invalid_conversion ("complex sparse matrix", "real scalar"); if (numel () > 1) @@ -139,7 +139,7 @@ octave_sparse_complex_matrix::complex_value (bool) const { // FIXME: maybe this should be a function, valid_as_scalar() - if (is_empty ()) + if (isempty ()) err_invalid_conversion ("complex sparse matrix", "real scalar"); if (numel () > 1)
--- a/libinterp/octave-value/ov-fcn-inline.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-fcn-inline.cc Sun Jun 11 22:14:09 2017 -0700 @@ -788,7 +788,7 @@ // Sort the arguments into ascii order. fargs.sort (); - if (fargs.is_empty ()) + if (fargs.isempty ()) fargs.append (std::string ("x")); }
--- a/libinterp/octave-value/ov-flt-re-mat.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-flt-re-mat.cc Sun Jun 11 22:14:09 2017 -0700 @@ -99,7 +99,7 @@ double octave_float_matrix::double_value (bool) const { - if (is_empty ()) + if (isempty ()) err_invalid_conversion ("real matrix", "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar", @@ -111,7 +111,7 @@ float octave_float_matrix::float_value (bool) const { - if (is_empty ()) + if (isempty ()) err_invalid_conversion ("real matrix", "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar",
--- a/libinterp/octave-value/ov-intx.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-intx.h Sun Jun 11 22:14:09 2017 -0700 @@ -109,7 +109,7 @@ { double retval = lo_ieee_nan_value (); - if (is_empty ()) + if (isempty ()) err_invalid_conversion (type_name (), "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar", @@ -125,7 +125,7 @@ { float retval = lo_ieee_float_nan_value (); - if (is_empty ()) + if (isempty ()) err_invalid_conversion (type_name (), "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar",
--- a/libinterp/octave-value/ov-java.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-java.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1437,7 +1437,7 @@ (jni_env->GetObjectArrayElement (jarr, r))); - if (m.is_empty ()) + if (m.isempty ()) { cols = jni_env->GetArrayLength (row); m.resize (cols, rows); @@ -1608,7 +1608,7 @@ #undef UNBOX_PRIMITIVE_SCALAR } - else if (val.is_empty ()) + else if (val.isempty ()) { jobj = 0; jcls = 0;
--- a/libinterp/octave-value/ov-perm.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-perm.cc Sun Jun 11 22:14:09 2017 -0700 @@ -148,7 +148,7 @@ double octave_perm_matrix::double_value (bool) const { - if (is_empty ()) + if (isempty ()) err_invalid_conversion (type_name (), "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar", @@ -160,7 +160,7 @@ float octave_perm_matrix::float_value (bool) const { - if (is_empty ()) + if (isempty ()) err_invalid_conversion (type_name (), "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar",
--- a/libinterp/octave-value/ov-range.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-range.cc Sun Jun 11 22:14:09 2017 -0700 @@ -269,7 +269,7 @@ { bool retval = false; - if (! range.is_empty ()) + if (! range.isempty ()) { if (dims ().numel () > 1) warn_array_as_logical (dims ()); @@ -293,7 +293,7 @@ // FIXME: this is a waste of memory. Matrix m ((range.matrix_value ().all ()).all ()); - retval = ! m.is_empty () && m(0, 0) != 0.0; + retval = ! m.isempty () && m(0, 0) != 0.0; } }
--- a/libinterp/octave-value/ov-re-mat.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-re-mat.cc Sun Jun 11 22:14:09 2017 -0700 @@ -114,7 +114,7 @@ double octave_matrix::double_value (bool) const { - if (is_empty ()) + if (isempty ()) err_invalid_conversion ("real matrix", "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar", @@ -126,7 +126,7 @@ float octave_matrix::float_value (bool) const { - if (is_empty ()) + if (isempty ()) err_invalid_conversion ("real matrix", "real scalar"); warn_implicit_conversion ("Octave:array-to-scalar",
--- a/libinterp/octave-value/ov-re-sparse.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-re-sparse.cc Sun Jun 11 22:14:09 2017 -0700 @@ -95,7 +95,7 @@ double octave_sparse_matrix::double_value (bool) const { - if (is_empty ()) + if (isempty ()) err_invalid_conversion ("real sparse matrix", "real scalar"); if (numel () > 1)
--- a/libinterp/octave-value/ov-str-mat.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-str-mat.cc Sun Jun 11 22:14:09 2017 -0700 @@ -347,7 +347,7 @@ charNDArray tmp(dv); - if (tmp.is_empty ()) + if (tmp.isempty ()) matrix = tmp; else {
--- a/libinterp/octave-value/ov-struct.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-struct.cc Sun Jun 11 22:14:09 2017 -0700 @@ -84,7 +84,7 @@ if (p != map.end ()) retval = map.contents (p); else if (auto_add) - retval = (is_empty ()) ? Cell (dim_vector (1, 1)) : Cell (dims ()); + retval = (isempty ()) ? Cell (dim_vector (1, 1)) : Cell (dims ()); else error_with_id ("Octave:invalid-indexing", "structure has no member '%s'", nm.c_str ()); @@ -1708,7 +1708,7 @@ return ovl (args(0).map_value ()); if ((nargin == 1 || nargin == 2) - && args(0).is_empty () && args(0).is_real_matrix ()) + && args(0).isempty () && args(0).is_real_matrix ()) { if (nargin == 2) { @@ -1843,7 +1843,7 @@ string_vector keys = m.fieldnames (); - if (keys.is_empty ()) + if (keys.isempty ()) retval = Cell (0, 1); else retval = Cell (keys);
--- a/libinterp/octave-value/ov-usr-fcn.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov-usr-fcn.cc Sun Jun 11 22:14:09 2017 -0700 @@ -945,7 +945,7 @@ static bool val_in_table (const Matrix& table, double val) { - if (table.is_empty ()) + if (table.isempty ()) return false; octave_idx_type i = table.lookup (val, ASCENDING);
--- a/libinterp/octave-value/ov.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1615,7 +1615,7 @@ // Empty array also means a match. if (tmp.is_defined ()) { - if (tmp.is_empty ()) + if (tmp.isempty ()) retval = true; else { @@ -2555,9 +2555,9 @@ error (e, "invalid increment value in colon expression"); } - bool base_empty = m_base.is_empty (); - bool limit_empty = m_limit.is_empty (); - bool increment_empty = m_increment.is_empty (); + bool base_empty = m_base.isempty (); + bool limit_empty = m_limit.isempty (); + bool increment_empty = m_increment.isempty (); if (base_empty || limit_empty || increment_empty) retval = Range ();
--- a/libinterp/octave-value/ov.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/octave-value/ov.h Sun Jun 11 22:14:09 2017 -0700 @@ -525,8 +525,12 @@ bool is_undefined (void) const { return ! is_defined (); } + bool isempty (void) const + { return rep->isempty (); } + + OCTAVE_DEPRECATED ("use 'isempty' instead") bool is_empty (void) const - { return rep->is_empty (); } + { return rep->isempty (); } bool iscell (void) const { return rep->iscell (); }
--- a/libinterp/parse-tree/bp-table.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/parse-tree/bp-table.cc Sun Jun 11 22:14:09 2017 -0700 @@ -253,7 +253,7 @@ else { Array<octave_value> W = U.index (static_cast<octave_idx_type> (0)); - if (W.is_empty () || W(0).is_empty ()) + if (W.isempty () || W(0).isempty ()) Vdebug_on_error = 1; // like "dbstop if error" with no identifier else if (! W(0).iscell ()) fail = true; @@ -279,7 +279,7 @@ else { Array<octave_value> W = U.index (static_cast<octave_idx_type> (0)); - if (W.is_empty () || W(0).is_empty ()) + if (W.isempty () || W(0).isempty ()) Vdebug_on_caught = 1; // like "dbstop if caught error" with no ID else if (! W(0).iscell ()) fail = true; @@ -305,7 +305,7 @@ else { Array<octave_value> W = U.index (static_cast<octave_idx_type> (0)); - if (W.is_empty () || W(0).is_empty ()) + if (W.isempty () || W(0).isempty ()) Vdebug_on_warning = 1; // like "dbstop if warning" with no identifier else if (! W(0).iscell ()) fail = true;
--- a/libinterp/parse-tree/oct-parse.in.yy Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/parse-tree/oct-parse.in.yy Sun Jun 11 22:14:09 2017 -0700 @@ -3931,7 +3931,7 @@ delete e; - if (ov.is_empty ()) + if (ov.isempty ()) bison_error ("invalid empty left hand side of assignment"); else bison_error ("invalid constant left hand side of assignment");
--- a/libinterp/parse-tree/pt-eval.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/parse-tree/pt-eval.cc Sun Jun 11 22:14:09 2017 -0700 @@ -1523,7 +1523,7 @@ { octave_quit (); - if (elt.is_empty ()) + if (elt.isempty ()) continue; ctmp = do_cat_op (ctmp, elt, ra_idx);
--- a/libinterp/parse-tree/pt-tm-const.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/parse-tree/pt-tm-const.cc Sun Jun 11 22:14:09 2017 -0700 @@ -203,7 +203,7 @@ { elt_changed = true; - if (elt.is_empty ()) + if (elt.isempty ()) elt = Cell (); else elt = Cell (elt);
--- a/libinterp/parse-tree/pt-tm-const.h Sun Jun 11 15:35:21 2017 -0700 +++ b/libinterp/parse-tree/pt-tm-const.h Sun Jun 11 22:14:09 2017 -0700 @@ -278,7 +278,7 @@ // Skip empty arrays to allow looser rules. - if (! ra.is_empty ()) + if (! ra.isempty ()) { result.insert (ra, r, c);
--- a/liboctave/array/Array.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/Array.cc Sun Jun 11 22:14:09 2017 -0700 @@ -2295,7 +2295,7 @@ // find (zeros (0,1,0)) -> zeros (0,0) // find (zeros (0,1,0,1)) -> zeros (0,0) etc - if ((numel () == 1 && retval.is_empty ()) + if ((numel () == 1 && retval.isempty ()) || (rows () == 0 && dims ().numel (1) == 0)) retval.dimensions = dim_vector (); else if (rows () == 1 && ndims () == 2) @@ -2325,7 +2325,7 @@ Array<T> m (dv); - if (m.is_empty ()) + if (m.isempty ()) return m; sortmode mode = UNSORTED; @@ -2675,7 +2675,7 @@ Array<T> retval (dv); - if (retval.is_empty ()) + if (retval.isempty ()) return retval; int nidx = std::max (dv.ndims (), static_cast<octave_idx_type> (dim + 1)); @@ -2690,7 +2690,7 @@ // an empty array may contribute a nonzero piece along the dimension // at this point, unless an empty array can be promoted to a non-empty // one (which makes no sense). I repeat, *no way*, think about it. - if (array_list[i].is_empty ()) + if (array_list[i].isempty ()) continue; octave_quit ();
--- a/liboctave/array/Array.h Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/Array.h Sun Jun 11 22:14:09 2017 -0700 @@ -558,7 +558,11 @@ bool is_square (void) const { return (dim1 () == dim2 ()); } - bool is_empty (void) const { return numel () == 0; } + bool isempty (void) const { return numel () == 0; } + + OCTAVE_DEPRECATED ("use 'isempty' instead") + bool is_empty (void) const + { return isempty (); } bool is_vector (void) const { return dimensions.is_vector (); }
--- a/liboctave/array/Range.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/Range.cc Sun Jun 11 22:14:09 2017 -0700 @@ -51,7 +51,7 @@ Matrix Range::matrix_value (void) const { - if (rng_numel > 0 && cache.is_empty ()) + if (rng_numel > 0 && cache.isempty ()) { cache.resize (1, rng_numel);
--- a/liboctave/array/Range.h Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/Range.h Sun Jun 11 22:14:09 2017 -0700 @@ -84,7 +84,11 @@ octave_idx_type numel (void) const { return rng_numel; } - bool is_empty (void) const { return numel () == 0; } + bool isempty (void) const { return numel () == 0; } + + OCTAVE_DEPRECATED ("use 'isempty' instead") + bool is_empty (void) const + { return isempty (); } bool all_elements_are_ints (void) const;
--- a/liboctave/array/Sparse.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/Sparse.cc Sun Jun 11 22:14:09 2017 -0700 @@ -2603,7 +2603,7 @@ Sparse<T> retval (dv, total_nz); - if (retval.is_empty ()) + if (retval.isempty ()) return retval; switch (dim) @@ -2622,7 +2622,7 @@ { const Sparse<T>& spi = sparse_list[i]; // Skipping empty matrices. See the comment in Array.cc. - if (spi.is_empty ()) + if (spi.isempty ()) continue; octave_idx_type kl = spi.cidx (j); @@ -2649,7 +2649,7 @@ octave_quit (); // Skipping empty matrices. See the comment in Array.cc. - if (sparse_list[i].is_empty ()) + if (sparse_list[i].isempty ()) continue; octave_idx_type u = l + sparse_list[i].columns ();
--- a/liboctave/array/Sparse.h Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/Sparse.h Sun Jun 11 22:14:09 2017 -0700 @@ -469,7 +469,11 @@ bool is_square (void) const { return (dim1 () == dim2 ()); } - bool is_empty (void) const { return (rows () < 1 && cols () < 1); } + bool isempty (void) const { return (rows () < 1 && cols () < 1); } + + OCTAVE_DEPRECATED ("use 'isempty' instead") + bool is_empty (void) const + { return isempty (); } Sparse<T> transpose (void) const;
--- a/liboctave/array/chNDArray.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/chNDArray.cc Sun Jun 11 22:14:09 2017 -0700 @@ -111,7 +111,7 @@ charNDArray tmp (rb.dims ()); octave_idx_type nel = rb.numel (); - if (rb.is_empty ()) + if (rb.isempty ()) return *this; for (octave_idx_type i = 0; i < nel; i++)
--- a/liboctave/array/dNDArray.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/dNDArray.cc Sun Jun 11 22:14:09 2017 -0700 @@ -768,7 +768,7 @@ retval.elem (i) = static_cast<char>(ival); } - if (rb.is_empty ()) + if (rb.isempty ()) return retval; retval.insert (rb, ra_idx);
--- a/liboctave/array/fNDArray.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/array/fNDArray.cc Sun Jun 11 22:14:09 2017 -0700 @@ -729,7 +729,7 @@ retval.elem (i) = static_cast<char>(ival); } - if (rb.is_empty ()) + if (rb.isempty ()) return retval; retval.insert (rb, ra_idx);
--- a/liboctave/numeric/DASPK.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/numeric/DASPK.cc Sun Jun 11 22:14:09 2017 -0700 @@ -85,7 +85,7 @@ if (ires >= 0) { - if (tmp_delta.is_empty ()) + if (tmp_delta.isempty ()) ires = -2; else {
--- a/liboctave/numeric/DASRT.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/numeric/DASRT.cc Sun Jun 11 22:14:09 2017 -0700 @@ -80,7 +80,7 @@ ires = octave::to_f77_int (tmp_ires); - if (tmp_fval.is_empty ()) + if (tmp_fval.isempty ()) ires = -2; else {
--- a/liboctave/numeric/DASSL.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/numeric/DASSL.cc Sun Jun 11 22:14:09 2017 -0700 @@ -82,7 +82,7 @@ if (ires >= 0) { - if (tmp_delta.is_empty ()) + if (tmp_delta.isempty ()) ires = -2; else {
--- a/liboctave/numeric/LSODE.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/numeric/LSODE.cc Sun Jun 11 22:14:09 2017 -0700 @@ -66,7 +66,7 @@ tmp_deriv = (*user_fun) (*tmp_x, time); - if (tmp_deriv.is_empty ()) + if (tmp_deriv.isempty ()) ierr = -1; else {
--- a/liboctave/numeric/bsxfun-defs.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/numeric/bsxfun-defs.cc Sun Jun 11 22:14:09 2017 -0700 @@ -77,7 +77,7 @@ ldr *= dvr(start); } - if (retval.is_empty ()) + if (retval.isempty ()) ; // do nothing else if (start == nd) op_vv (retval.numel (), rvec, xvec, yvec); @@ -158,7 +158,7 @@ ldr *= dvr(start); } - if (r.is_empty ()) + if (r.isempty ()) ; // do nothing else if (start == nd) op_vv (r.numel (), rvec, xvec);
--- a/liboctave/numeric/eigs-base.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/numeric/eigs-base.cc Sun Jun 11 22:14:09 2017 -0700 @@ -270,7 +270,7 @@ SparseMatrix& L, SparseMatrix& U, octave_idx_type *P, octave_idx_type *Q) { - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); octave_idx_type n = m.rows (); // Caclulate LU decomposition of 'A - sigma * B' @@ -362,7 +362,7 @@ Matrix& L, Matrix& U, octave_idx_type *P, octave_idx_type *Q) { - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); octave_idx_type n = m.cols (); // Caclulate LU decomposition of 'A - sigma * B' @@ -434,7 +434,7 @@ SparseComplexMatrix& L, SparseComplexMatrix& U, octave_idx_type *P, octave_idx_type *Q) { - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); octave_idx_type n = m.rows (); // Caclulate LU decomposition of 'A - sigma * B' @@ -526,7 +526,7 @@ ComplexMatrix& L, ComplexMatrix& U, octave_idx_type *P, octave_idx_type *Q) { - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); octave_idx_type n = m.cols (); // Caclulate LU decomposition of 'A - sigma * B' @@ -607,7 +607,7 @@ M b(_b); F77_INT n = octave::to_f77_int (m.cols ()); F77_INT mode = 1; - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); bool note3 = false; char bmat = 'I'; double sigma = 0.; @@ -619,7 +619,7 @@ (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); - if (resid.is_empty ()) + if (resid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform"); @@ -651,7 +651,7 @@ (*current_liboctave_error_handler) ("eigs: opts.p must be greater than k and less than n"); - if (have_b && cholB && ! permB.is_empty ()) + if (have_b && cholB && ! permB.isempty ()) { // Check the we really have a permutation vector if (permB.numel () != n) @@ -685,7 +685,7 @@ { bt = b; b = b.transpose (); - if (permB.is_empty ()) + if (permB.isempty ()) { permB = ColumnVector (n); for (F77_INT i = 0; i < n; i++) @@ -885,7 +885,7 @@ M b(_b); F77_INT n = octave::to_f77_int (m.cols ()); F77_INT mode = 3; - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); std::string typ = "LM"; if (m.rows () != m.cols ()) @@ -900,7 +900,7 @@ // _b, permB, resid, os, tol, rvec, cholB, // disp, maxit); - if (resid.is_empty ()) + if (resid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform"); @@ -932,7 +932,7 @@ (*current_liboctave_error_handler) ("eigs: opts.p must be greater than k and less than n"); - if (have_b && cholB && ! permB.is_empty ()) + if (have_b && cholB && ! permB.isempty ()) { // Check the we really have a permutation vector if (permB.numel () != n) @@ -1184,7 +1184,7 @@ F77_INT mode = 1; int err = 0; - if (resid.is_empty ()) + if (resid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform"); @@ -1424,7 +1424,7 @@ M b(_b); F77_INT n = octave::to_f77_int (m.cols ()); F77_INT mode = 1; - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); bool note3 = false; char bmat = 'I'; double sigmar = 0.; @@ -1437,7 +1437,7 @@ (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); - if (resid.is_empty ()) + if (resid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform"); @@ -1469,7 +1469,7 @@ (*current_liboctave_error_handler) ("eigs: opts.p must be greater than k and less than n"); - if (have_b && cholB && ! permB.is_empty ()) + if (have_b && cholB && ! permB.isempty ()) { // Check the we really have a permutation vector if (permB.numel () != n) @@ -1503,7 +1503,7 @@ { bt = b; b = b.transpose (); - if (permB.is_empty ()) + if (permB.isempty ()) { permB = ColumnVector (n); for (F77_INT i = 0; i < n; i++) @@ -1751,7 +1751,7 @@ M b(_b); F77_INT n = octave::to_f77_int (m.cols ()); F77_INT mode = 3; - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); std::string typ = "LM"; double sigmai = 0.; @@ -1767,7 +1767,7 @@ // _b, permB, resid, os, tol, rvec, cholB, // disp, maxit); - if (resid.is_empty ()) + if (resid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform"); @@ -1799,7 +1799,7 @@ (*current_liboctave_error_handler) ("eigs: opts.p must be greater than k and less than n"); - if (have_b && cholB && ! permB.is_empty ()) + if (have_b && cholB && ! permB.isempty ()) { // Check that we really have a permutation vector if (permB.numel () != n) @@ -2105,7 +2105,7 @@ F77_INT mode = 1; int err = 0; - if (resid.is_empty ()) + if (resid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform"); @@ -2393,7 +2393,7 @@ M b(_b); F77_INT n = octave::to_f77_int (m.cols ()); F77_INT mode = 1; - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); bool note3 = false; char bmat = 'I'; Complex sigma = 0.; @@ -2405,7 +2405,7 @@ (*current_liboctave_error_handler) ("eigs: B must be square and the same size as A"); - if (cresid.is_empty ()) + if (cresid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform"); @@ -2441,7 +2441,7 @@ (*current_liboctave_error_handler) ("eigs: opts.p must be greater than k and less than n"); - if (have_b && cholB && ! permB.is_empty ()) + if (have_b && cholB && ! permB.isempty ()) { // Check the we really have a permutation vector if (permB.numel () != n) @@ -2475,7 +2475,7 @@ { bt = b; b = b.hermitian (); - if (permB.is_empty ()) + if (permB.isempty ()) { permB = ColumnVector (n); for (F77_INT i = 0; i < n; i++) @@ -2679,7 +2679,7 @@ M b(_b); F77_INT n = octave::to_f77_int (m.cols ()); F77_INT mode = 3; - bool have_b = ! b.is_empty (); + bool have_b = ! b.isempty (); std::string typ = "LM"; if (m.rows () != m.cols ()) @@ -2694,7 +2694,7 @@ // eig_val, _b, permB, cresid, os, tol, // rvec, cholB, disp, maxit); - if (cresid.is_empty ()) + if (cresid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform"); @@ -2730,7 +2730,7 @@ (*current_liboctave_error_handler) ("eigs: opts.p must be greater than k and less than n"); - if (have_b && cholB && ! permB.is_empty ()) + if (have_b && cholB && ! permB.isempty ()) { // Check that we really have a permutation vector if (permB.numel () != n) @@ -2994,7 +2994,7 @@ F77_INT mode = 1; int err = 0; - if (cresid.is_empty ()) + if (cresid.isempty ()) { std::string rand_dist = octave_rand::distribution (); octave_rand::distribution ("uniform");
--- a/liboctave/numeric/oct-convn.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/numeric/oct-convn.cc Sun Jun 11 22:14:09 2017 -0700 @@ -132,7 +132,7 @@ convolve (const MArray<T>& a, const MArray<R>& b, convn_type ct) { - if (a.is_empty () || b.is_empty ()) + if (a.isempty () || b.isempty ()) return MArray<T> (); int nd = std::max (a.ndims (), b.ndims ());
--- a/liboctave/numeric/qr.cc Sun Jun 11 15:35:21 2017 -0700 +++ b/liboctave/numeric/qr.cc Sun Jun 11 22:14:09 2017 -0700 @@ -73,7 +73,7 @@ { type retval; - if (! q.is_empty () && q.is_square ()) + if (! q.isempty () && q.is_square ()) retval = qr<T>::std; else if (q.rows () > q.cols () && r.is_square ()) retval = qr<T>::economy;