view libgui/qterminal-module.mk @ 19006:2e0613dadfee draft

All calls to "find" use the same generic implementation (bug #42408, 42421) * find.cc: Rewrite. Move generic "find" logic to find.h (Ffind) : Changed calls to find_nonzero_elem_idx to find_templated Added unit test for bug #42421 * Array.cc (and .h) (Array::find): Deleted function. Replaced with find::find(Array) from find.h * Array.h: Added typedef for array_iterator (in nz-iterators.h) as Array::iter_type * DiagArray2.h: Added typedef for diag_iterator (in nz-iterators.h) as DiagArray2::iter_type * PermMatrix.h: Added typedef for perm_iterator (in nz-iterators.h) as PermMatrix::iter_type Also added typedef for bool as PermMatrix::element_type (not octave_idx_type) Added an nnz() function (which is an alias for perm_length) and a perm_elem(i) function for retrieving the ith element of the permutation * Sparse.h: Added typedef for sparse_iterator (in nz-iterators.h) as Sparse::iter_type Added a short comment documenting the the argument to the numel function * idx-vector.cc (idx_vector::idx_mask_rep::as_array): Changed Array.find to find::find(Array) (in find.h) * (new file) find.h * (new file) interp-idx.h: Simple methods for converting between interpreter index type and internal octave_idx_type/row-col pair * (new file) min-with-nnz.h: Fast methods for taking an arbitrary matrix M and an octave_idx_type n and finding min(M.nnz(), n) * (new file) nz-iterators.h: Iterators for traversing (in column-major order) the nonzero elements of any array or matrix backwards or forwards * (new file) direction.h: Generic methods for simplifying code has to deal with a "backwards or forwards" template argument * build-sparse-tests.sh: Removed 5-return-value calls to "find" in unit-tests; Admittedly this commit breaks this "feature" which was undocumented and only partially supported to begin with (ie never worked for full matrices, permutation matrices, or diagonal matrices)
author David Spies <dnspies@gmail.com>
date Tue, 17 Jun 2014 16:41:11 -0600
parents 4c3c3cf9ef58
children
line wrap: on
line source

EXTRA_DIST += \
  qterminal-module.mk

noinst_HEADERS += \
  qterminal/libqterminal/QTerminal.h \
  qterminal/libqterminal/win32/QTerminalColors.h \
  qterminal/libqterminal/win32/QWinTerminalImpl.h \
  qterminal/libqterminal/unix/BlockArray.h \
  qterminal/libqterminal/unix/Character.h \
  qterminal/libqterminal/unix/CharacterColor.h \
  qterminal/libqterminal/unix/Emulation.h \
  qterminal/libqterminal/unix/ExtendedDefaultTranslator.h \
  qterminal/libqterminal/unix/ExtendedDefaultTranslatorMac.h \
  qterminal/libqterminal/unix/Filter.h \
  qterminal/libqterminal/unix/History.h \
  qterminal/libqterminal/unix/KeyboardTranslator.h \
  qterminal/libqterminal/unix/konsole_wcwidth.h \
  qterminal/libqterminal/unix/kpty.h \
  qterminal/libqterminal/unix/kpty_p.h \
  qterminal/libqterminal/unix/LineFont.h \
  qterminal/libqterminal/unix/QUnixTerminalImpl.h \
  qterminal/libqterminal/unix/Screen.h \
  qterminal/libqterminal/unix/ScreenWindow.h \
  qterminal/libqterminal/unix/TerminalCharacterDecoder.h \
  qterminal/libqterminal/unix/Vt102Emulation.h \
  qterminal/libqterminal/unix/SelfListener.h \
  qterminal/libqterminal/unix/TerminalModel.h \
  qterminal/libqterminal/unix/TerminalView.h

qterminal_libqterminal_la_MOC = \
  qterminal/libqterminal/moc-QTerminal.cc

nodist_qterminal_libqterminal_la_SOURCES = $(qterminal_libqterminal_la_MOC)

qterminal_libqterminal_la_CPPFLAGS = \
  $(AM_CPPFLAGS) \
  @QT_CPPFLAGS@ \
  -I$(srcdir)/qterminal/libqterminal

qterminal_libqterminal_la_CFLAGS = $(AM_CFLAGS)

qterminal_libqterminal_la_CXXFLAGS = $(AM_CXXFLAGS)

if WIN32_TERMINAL

qterminal_libqterminal_la_SOURCES = \
  qterminal/libqterminal/win32/QTerminalColors.cpp \
  qterminal/libqterminal/win32/QWinTerminalImpl.cpp \
  qterminal/libqterminal/QTerminal.cc

qterminal_libqterminal_la_MOC += \
  qterminal/libqterminal/win32/moc-QWinTerminalImpl.cc

qterminal_libqterminal_la_CPPFLAGS += -DUNICODE

# This flag is required to let MOC know about Q_OS_WIN32.
MOC_CPPFLAGS += -DQ_OS_WIN32

else

qterminal_libqterminal_la_SOURCES = \
  qterminal/libqterminal/unix/BlockArray.cpp \
  qterminal/libqterminal/unix/Emulation.cpp \
  qterminal/libqterminal/unix/Filter.cpp \
  qterminal/libqterminal/unix/History.cpp \
  qterminal/libqterminal/unix/KeyboardTranslator.cpp \
  qterminal/libqterminal/unix/konsole_wcwidth.cpp \
  qterminal/libqterminal/unix/kpty.cpp \
  qterminal/libqterminal/unix/QUnixTerminalImpl.cpp \
  qterminal/libqterminal/unix/Screen.cpp \
  qterminal/libqterminal/unix/ScreenWindow.cpp \
  qterminal/libqterminal/unix/TerminalCharacterDecoder.cpp \
  qterminal/libqterminal/unix/Vt102Emulation.cpp \
  qterminal/libqterminal/unix/SelfListener.cpp \
  qterminal/libqterminal/unix/TerminalModel.cpp \
  qterminal/libqterminal/unix/TerminalView.cpp \
  qterminal/libqterminal/QTerminal.cc

qterminal_libqterminal_la_MOC += \
  qterminal/libqterminal/unix/moc-Emulation.cc \
  qterminal/libqterminal/unix/moc-Filter.cc \
  qterminal/libqterminal/unix/moc-QUnixTerminalImpl.cc \
  qterminal/libqterminal/unix/moc-ScreenWindow.cc \
  qterminal/libqterminal/unix/moc-SelfListener.cc \
  qterminal/libqterminal/unix/moc-TerminalModel.cc \
  qterminal/libqterminal/unix/moc-TerminalView.cc \
  qterminal/libqterminal/unix/moc-Vt102Emulation.cc

endif

noinst_LTLIBRARIES += qterminal/libqterminal.la

CLEANFILES += $(qterminal_libqterminal_la_MOC)