Mercurial > octave
diff libgui/src/m-editor/octave-qscintilla.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 | 226df400639c |
| children | 7854d5752dd2 |
line wrap: on
line diff
--- a/libgui/src/m-editor/octave-qscintilla.cc Tue Dec 08 21:34:55 2020 +0100 +++ b/libgui/src/m-editor/octave-qscintilla.cc Tue Dec 08 13:25:03 2020 -0800 @@ -917,14 +917,14 @@ // Do the job interp.source_file (file); } - catch (const execution_exception& e) + catch (const execution_exception& ee) { // Catch errors otherwise the rest of the interpreter // will not be executed (cleaning up). // New error message and error stack - QString new_msg = QString::fromStdString (e.message ()); - std::list<frame_info> stack = e.stack_info (); + QString new_msg = QString::fromStdString (ee.message ()); + std::list<frame_info> stack = ee.stack_info (); // Remove line and column from first line of error message only // if it is related to the tmp itself, i.e. only if the @@ -974,11 +974,11 @@ dbg, auto_repeat); // New exception with updated message and stack - execution_exception ee (e.err_type (),e.identifier (), - new_msg.toStdString (), stack); + execution_exception nee (ee.err_type (), ee.identifier (), + new_msg.toStdString (), stack); // Throw - throw (ee); + throw (nee); } // Clean up