Mercurial > octave-nkf
view libgui/qterminal-module.mk @ 20574:dd6345fd8a97
use exceptions for better invalid index error reporting (bug #45957)
* lo-array-gripes.h, lo-array-gripes.cc (index_exception):
New base class for indexing errors.
(invalid_index, out_of_range): New classes.
(gripe_index_out_of_range): New overloaded function.
(gripe_invalid_index): New overloaded functions.
Delete version with no arguments.
(gripe_invalid_assignment_size, gripe_assignment_dimension_mismatch):
Delete.
Change uses of gripe functions as needed.
* Cell.cc (Cell::index, Cell::assign, Cell::delete_elements): Use
exceptions to collect error info about and handle indexing errors.
* data.cc (Fnth_element, do_accumarray_sum, F__accumarray_sum__,
do_accumarray_minmax, do_accumarray_minmax_fun, F__accumdim_sum__):
Likewise.
* oct-map.cc (octave_map::index, octave_map::assign,
octave_map::delete_elements): Likewise.
* sparse.cc (Fsparse): Likewise.
* sub2ind.cc (Fsub2ind, Find2sub): Likewise. New tests.
* utils.cc (dims_to_numel): Likewise.
* ov-base-diag.cc (octave_base_diag<DMT, MT>::do_index_op,
octave_base_diag<DMT, MT>::subsasgn): Likewise.
* ov-base-mat.cc (octave_base_matrix<MT>::subsref,
octave_base_matrix<MT>::assign): Likewise.
* ov-base-sparse.cc (octave_base_sparse<T>::do_index_op,
octave_base_sparse<T>::assign,
octave_base_sparse<MT>::delete_elements): Likewise.
* ov-classdef.cc (cdef_object_array::subsref,
cdef_object_array::subsasgn): Likewise.
* ov-java.cc (make_java_index): Likewise.
* ov-perm.cc (octave_perm_matrix::do_index_op): Likewise.
* ov-range.cc (octave_range::do_index_op): Likewise.
* ov-re-diag.cc (octave_diag_matrix::do_index_op): Likewise.
* ov-str-mat.cc (octave_char_matrix_str::do_index_op_internal): Likewise.
* pt-assign.cc (tree_simple_assignment::rvalue1): Likewise.
* pt-idx.cc (tree_index_expression::rvalue,
tree_index_expression::lvalue): Likewise.
* Array-util.cc (sub2ind): Likewise.
* toplev.cc (main_loop): Also catch unhandled index_exception
exceptions.
* ov-base.cc (octave_base_value::index_vector): Improve error message.
* ov-re-sparse.cc (octave_sparse_matrix::index_vector): Likewise.
* ov-complex.cc (complex_index): New class.
(gripe_complex_index): New function.
(octave_complex::index_vector): Use it.
* pt-id.h, pt-id.cc (tree_identifier::is_variable,
tree_black_hole::is_variable): Now const.
* pt-idx.cc (final_index_error): New static function.
(tree_index_expression::rvalue, tree_index_expression::lvalue):
Use it.
* index.tst: New tests.
| author | Lachlan Andrew <lachlanbis@gmail.com> |
|---|---|
| date | Fri, 02 Oct 2015 15:07:37 -0400 |
| parents | 6b7c10920dfe |
| children |
line wrap: on
line source
noinst_HEADERS += \ libgui/qterminal/libqterminal/QTerminal.h \ libgui/qterminal/libqterminal/win32/QTerminalColors.h \ libgui/qterminal/libqterminal/win32/QWinTerminalImpl.h \ libgui/qterminal/libqterminal/unix/BlockArray.h \ libgui/qterminal/libqterminal/unix/Character.h \ libgui/qterminal/libqterminal/unix/CharacterColor.h \ libgui/qterminal/libqterminal/unix/Emulation.h \ libgui/qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \ libgui/qterminal/libqterminal/unix/ExtendedDefaultTranslatorMac.h \ libgui/qterminal/libqterminal/unix/Filter.h \ libgui/qterminal/libqterminal/unix/History.h \ libgui/qterminal/libqterminal/unix/KeyboardTranslator.h \ libgui/qterminal/libqterminal/unix/konsole_wcwidth.h \ libgui/qterminal/libqterminal/unix/kpty.h \ libgui/qterminal/libqterminal/unix/kpty_p.h \ libgui/qterminal/libqterminal/unix/LineFont.h \ libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.h \ libgui/qterminal/libqterminal/unix/Screen.h \ libgui/qterminal/libqterminal/unix/ScreenWindow.h \ libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.h \ libgui/qterminal/libqterminal/unix/Vt102Emulation.h \ libgui/qterminal/libqterminal/unix/SelfListener.h \ libgui/qterminal/libqterminal/unix/TerminalModel.h \ libgui/qterminal/libqterminal/unix/TerminalView.h libgui_qterminal_libqterminal_la_MOC = OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC = \ libgui/qterminal/libqterminal/moc-QTerminal.cc $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC): | libgui/qterminal/libqterminal/$(octave_dirstamp) DIRSTAMP_FILES += \ libgui/qterminal/libqterminal/$(octave_dirstamp) libgui_qterminal_libqterminal_la_MOC += \ $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_MOC) nodist_libgui_qterminal_libqterminal_la_SOURCES = $(libgui_qterminal_libqterminal_la_MOC) libgui_qterminal_libqterminal_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ @QT_CPPFLAGS@ \ -I$(srcdir)/libgui/qterminal/libqterminal \ -I$(srcdir)/libgui/src libgui_qterminal_libqterminal_la_CFLAGS = $(AM_CFLAGS) libgui_qterminal_libqterminal_la_CXXFLAGS = $(AM_CXXFLAGS) if WIN32_TERMINAL libgui_qterminal_libqterminal_la_SOURCES = \ libgui/qterminal/libqterminal/win32/QTerminalColors.cpp \ libgui/qterminal/libqterminal/win32/QWinTerminalImpl.cpp \ libgui/qterminal/libqterminal/QTerminal.cc OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC = \ libgui/qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc libgui_qterminal_libqterminal_la_MOC += \ $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC) $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_WIN32_MOC): | libgui/qterminal/libqterminal/win32/$(octave_dirstamp) DIRSTAMP_FILES += \ libgui/qterminal/libqterminal/win32/$(octave_dirstamp) libgui_qterminal_libqterminal_la_CPPFLAGS += -DUNICODE # This flag is required to let MOC know about Q_OS_WIN32. MOC_CPPFLAGS += -DQ_OS_WIN32 else libgui_qterminal_libqterminal_la_SOURCES = \ libgui/qterminal/libqterminal/unix/BlockArray.cpp \ libgui/qterminal/libqterminal/unix/Emulation.cpp \ libgui/qterminal/libqterminal/unix/Filter.cpp \ libgui/qterminal/libqterminal/unix/History.cpp \ libgui/qterminal/libqterminal/unix/KeyboardTranslator.cpp \ libgui/qterminal/libqterminal/unix/konsole_wcwidth.cpp \ libgui/qterminal/libqterminal/unix/kpty.cpp \ libgui/qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \ libgui/qterminal/libqterminal/unix/Screen.cpp \ libgui/qterminal/libqterminal/unix/ScreenWindow.cpp \ libgui/qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \ libgui/qterminal/libqterminal/unix/Vt102Emulation.cpp \ libgui/qterminal/libqterminal/unix/SelfListener.cpp \ libgui/qterminal/libqterminal/unix/TerminalModel.cpp \ libgui/qterminal/libqterminal/unix/TerminalView.cpp \ libgui/qterminal/libqterminal/QTerminal.cc OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC = \ libgui/qterminal/libqterminal/unix/moc-Emulation.cc \ libgui/qterminal/libqterminal/unix/moc-Filter.cc \ libgui/qterminal/libqterminal/unix/moc-QUnixTerminalImpl.cc \ libgui/qterminal/libqterminal/unix/moc-ScreenWindow.cc \ libgui/qterminal/libqterminal/unix/moc-SelfListener.cc \ libgui/qterminal/libqterminal/unix/moc-TerminalModel.cc \ libgui/qterminal/libqterminal/unix/moc-TerminalView.cc \ libgui/qterminal/libqterminal/unix/moc-Vt102Emulation.cc libgui_qterminal_libqterminal_la_MOC += \ $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC) $(OCTAVE_GUI_QTERMINAL_LIBQTERMINAL_UNIX_MOC): | libgui/qterminal/libqterminal/unix/$(octave_dirstamp) DIRSTAMP_FILES += \ libgui/qterminal/libqterminal/unix/$(octave_dirstamp) endif noinst_LTLIBRARIES += libgui/qterminal/libqterminal.la libgui_CLEANFILES += $(libgui_qterminal_libqterminal_la_MOC)