Mercurial > octave
diff libinterp/corefcn/sub2ind.cc @ 29163:8f67ad8b3103
maint: Updating naming conventions for exceptions and use const where possible.
* GLCanvas.cc, interpreter-qobject.cc, file-editor-tab.cc,
octave-qscintilla.cc, octave-qobject.cc, Cell.cc, __eigs__.cc,
__magick_read__.cc, __qp__.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
file-io.cc, graphics.cc, graphics.in.h, input.cc, interpreter.cc,
ls-mat-ascii.cc, lsode.cc, oct-handle.h, oct-map.cc, quad.cc, rand.cc,
sparse.cc, sub2ind.cc, toplev.cc, utils.cc, __init_gnuplot__.cc, __ode15__.cc,
cdef-object.cc, ov-base-diag.cc, ov-base-mat.cc, ov-base-sparse.cc,
ov-base.cc, ov-fcn-handle.cc, ov-java.cc, ov-perm.cc, ov-range.cc,
ov-re-diag.cc, ov-str-mat.cc, ov.cc, pt-assign.cc, pt-eval.cc, pt-idx.cc,
pt-jit.cc, pt.cc, Array-util.cc, randmtzig.cc:
Update naming conventions for exceptions to use initial letter of exception
type. For example, "execution_exception" is named "ee", "index_exception" is
"ie". Catch "const" exceptions where possible.
* gzip.cc: Add block to catch and throw interrupt_exceptions before having
a catch block "(...)" for everything else.
| author | Rik <rik@octave.org> |
|---|---|
| date | Tue, 08 Dec 2020 13:25:03 -0800 |
| parents | d9d028b479ac |
| children | 7854d5752dd2 |
line wrap: on
line diff
--- a/libinterp/corefcn/sub2ind.cc Tue Dec 08 21:34:55 2020 +0100 +++ b/libinterp/corefcn/sub2ind.cc Tue Dec 08 13:25:03 2020 -0800 @@ -130,12 +130,12 @@ if (j > 0 && args(j+1).dims () != args(1).dims ()) error ("sub2ind: all subscripts must be of the same size"); } - catch (octave::index_exception& e) + catch (octave::index_exception& ie) { - e.set_pos_if_unset (nargin-1, j+1); - e.set_var (); - std::string msg = e.message (); - error_with_id (e.err_id (), "%s", msg.c_str ()); + ie.set_pos_if_unset (nargin-1, j+1); + ie.set_var (); + std::string msg = ie.message (); + error_with_id (ie.err_id (), "%s", msg.c_str ()); } } @@ -270,9 +270,9 @@ { retval = Array<octave_value> (ind2sub (dv, args(1).index_vector ())); } - catch (const octave::index_exception& e) + catch (const octave::index_exception& ie) { - error ("ind2sub: invalid index %s", e.what ()); + error ("ind2sub: invalid index %s", ie.what ()); } return retval;