Mercurial > octave-nkf

view libgui/qterminal-module.mk @ 20569:b70cc4bd8109

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
begin removal of global error_state variable * gripes.h, gripes.cc (gripe_library_execution_error): Delete. * error.cc (warning_state): Delete unused variable. (reset_error_handler): Don't set warning_state or error_state. (debug_or_throw_exception): New static function. (verror): Don't check error_state. (vmessage): Call debug_or_throw_exception instead of setting error_state. (error_1, error_2): Combine into single function, error_1 that prints error message and ultimately calls debug_or_throw_exception. (verror, verror_with_cfn, verror_with_id_cfn): Call error_1. Don't check or set warning_state. (error): Don't check error_state. (Flasterror, Flasterr): Adapt to not using error_state. (interpreter_try): Don't unwind_protect error_state. * NEWS: Update. * doc/interpreter/external.txi: Explain octave_execution_exception instead of error_state for matrix addition example. * jit-typeinfo.cc (octave_jit_gripe_nan_to_logical_conversion, octave_jit_ginvalid_index, octave_jit_gindex_range, octave_jit_paren_scalar, octave_jit_paren_scalar_subsasgn): Don't catch octave_execution_exception. * cellfun.cc (Fcellfun): Use exceptions instead of error_state. * ls-mat-ascii.cc (save_mat_ascii_data): Likewise. * mex.cc (mexCallMATLAB, mexEvalString): Likewise. * variables.cc (safe_symbol_lookup): Likewise. * svd.cc (Fsvd): Eliminate use of error_state. * __magick_read__.cc (read_file, write_file): Likewise. * variables.cc (generate_struct_completions): Eliminate use of obsolete warning_state variable. * ov-builtin.cc (octave_builtin::do_multi_index_op): Don't catch octave_execution_exception and call gripe_library_execution_error. * ov-class.cc (octave_class::reconstruct_exemplar): Eliminate use of error_state. Catch possible octave_execution_exception in do_multi_index_op. * ov-mex-fcn.cc (octave_mex_function::do_multi_index_op): Eliminate use of error_state. Catch possible octave_execution_exception in call_mex. * ov-fcn-handle.cc (octave_fcn_binder::maybe_binder): Eliminate use of error_state. * ov-oncleanup.cc (octave_oncleanup::~octave_oncleanup): Eliminate use of error_state. Propagate possible octave_execution_exception from do_multi_index_op. * ov.cc (octave_value::assign, do_binary_op, do_unary_op, octave_value::do_non_const_unary_op): Don't catch octave_execution_exception here. * oct-parse.in.yy (octave_base_parser::finish_colon_expression, octave_base_parser::finish_array_list): Eliminate use of warning_state and error_state. (Feval, Fevalin): Use exceptions instead of error_state. * pt-eval.cc, pt-eval.h (tree_evaluator::unwind_protect_exception): New static variable. * (tree_evaluator::visit_statement): Don't catch octave_execution_exception here. (tree_evaluator::visit_try_catch_command, tree_evaluator::do_unwind_protect_cleanup): Eliminate use of error_state. (tree_evaluator::visit_unwind_protect_command): Use unwind_protect_exception to track whether an exception has occurred in the try block.
author John W. Eaton <jwe@octave.org>
date Thu, 01 Oct 2015 16:18:19 -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)