Mercurial > octave
diff libinterp/corefcn/interpreter.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 | dff830c84726 |
| children | 254ee9af5014 |
line wrap: on
line diff
--- a/libinterp/corefcn/interpreter.cc Tue Dec 08 21:34:55 2020 +0100 +++ b/libinterp/corefcn/interpreter.cc Tue Dec 08 13:25:03 2020 -0800 @@ -353,9 +353,9 @@ return 1; } - catch (const execution_exception& e) + catch (const execution_exception& ee) { - interp.handle_exception (e); + interp.handle_exception (ee); return 1; } @@ -806,9 +806,9 @@ exit_status = main_loop (); } } - catch (const exit_exception& ex) + catch (const exit_exception& xe) { - return ex.exit_status (); + return xe.exit_status (); } return exit_status; @@ -1039,9 +1039,9 @@ { recover_from_exception (); } - catch (const execution_exception& e) + catch (const execution_exception& ee) { - handle_exception (e); + handle_exception (ee); } } @@ -1149,9 +1149,9 @@ return 1; } - catch (const execution_exception& e) + catch (const execution_exception& ee) { - handle_exception (e); + handle_exception (ee); return 1; } @@ -1292,12 +1292,12 @@ if (m_interactive) octave_stdout << "\n"; } - catch (const index_exception& e) + catch (const index_exception& ie) { recover_from_exception (); std::cerr << "error: unhandled index exception: " - << e.message () << " -- trying to return to prompt" + << ie.message () << " -- trying to return to prompt" << std::endl; } catch (const execution_exception& ee) @@ -1971,9 +1971,9 @@ { recover_from_exception (); } - catch (const execution_exception& e) + catch (const execution_exception& ee) { - handle_exception (e); + handle_exception (ee); } } }