Mercurial > octave

view libinterp/octave-value/module.mk @ 28427:7a8c69c4eb55 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert obsolete octave_fcn_inline object to @inline class Use a legacy @class object to provide inline function objects instead of using a built-in class derived from the octave_function_handle class. * scripts/legacy/@inline: New directory containing the following files: argnames.m, char.m, feval.m, formula.m, inline.m, subsref.m, vectorize.m. * scripts/legacy/@inline/module.mk: New file. * scripts/legacy/module.mk, scripts/module.mk: Update. * test/inline-fcn.tst: New tests. * test/module.mk: Update. * ov-fcn-inline.h, ov-fcn-inline.cc: Delete. Remove all uses. * libinterp/octave-value/module.mk: Update. * external.txi, func.txi, octave.texi, plot.txi, quad.txi: Eliminate discusion of inline function objects. * fplot.m, __ezplot__.m: Use isa to identify inline objects instead of instead of checking typeinfo. * ov-fcn-handle.cc, ov-typeinfo.cc: Fix tests. * ov-base.h, ov-base.cc (octave_base_value::fcn_inline_value): Delete. * ov.h, ov.cc (octave_value::fcn_inline_value): Delete. (octave_value::xfcn_inline_value): Delete value extractor. * ov-class.cc, ov-class.h (octave_inline, octave_inline_fcn): New classes that allow us to preserve the is_inline_function and function_value methods that were previously available in the octave_fcn_inline class. (F__inline_ctor__): New function for final construction of inline objects. * ls-hdf5.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc: Handle loading of inline function objects from old files as special cases. New inline function objects will be saved and loaded as ordinary @class objects.
author John W. Eaton <jwe@octave.org>
date Mon, 23 Mar 2020 15:29:49 -0400
parents d1419ac09564
children ee9b1081471f
line wrap: on
line source

OV_INTTYPE_INC = \
  %reldir%/ov-base-int.h \
  %reldir%/ov-int-traits.h \
  %reldir%/ov-int16.h \
  %reldir%/ov-int32.h \
  %reldir%/ov-int64.h \
  %reldir%/ov-int8.h \
  %reldir%/ov-intx.h \
  %reldir%/ov-uint16.h \
  %reldir%/ov-uint32.h \
  %reldir%/ov-uint64.h \
  %reldir%/ov-uint8.h

OV_SPARSE_INC = \
  %reldir%/ov-base-sparse.h \
  %reldir%/ov-bool-sparse.h \
  %reldir%/ov-cx-sparse.h \
  %reldir%/ov-re-sparse.h

OCTAVE_VALUE_INC = \
  %reldir%/cdef-class.h \
  %reldir%/cdef-manager.h \
  %reldir%/cdef-method.h \
  %reldir%/cdef-object.h \
  %reldir%/cdef-package.h \
  %reldir%/cdef-property.h \
  %reldir%/cdef-utils.h \
  %reldir%/ov-base-diag.h \
  %reldir%/ov-base-mat.h \
  %reldir%/ov-base-scalar.h \
  %reldir%/ov-base.h \
  %reldir%/ov-bool-mat.h \
  %reldir%/ov-bool.h \
  %reldir%/ov-builtin.h \
  %reldir%/ov-cell.h \
  %reldir%/ov-ch-mat.h \
  %reldir%/ov-class.h \
  %reldir%/ov-classdef.h \
  %reldir%/ov-colon.h \
  %reldir%/ov-complex.h \
  %reldir%/ov-cs-list.h \
  %reldir%/ov-cx-diag.h \
  %reldir%/ov-cx-mat.h \
  %reldir%/ov-dld-fcn.h \
  %reldir%/ov-fcn-handle.h \
  %reldir%/ov-fcn.h \
  %reldir%/ov-float.h \
  %reldir%/ov-flt-complex.h \
  %reldir%/ov-flt-cx-diag.h \
  %reldir%/ov-flt-cx-mat.h \
  %reldir%/ov-flt-re-diag.h \
  %reldir%/ov-flt-re-mat.h \
  %reldir%/ov-java.h \
  %reldir%/ov-lazy-idx.h \
  %reldir%/ov-mex-fcn.h \
  %reldir%/ov-null-mat.h \
  %reldir%/ov-oncleanup.h \
  %reldir%/ov-perm.h \
  %reldir%/ov-range.h \
  %reldir%/ov-re-diag.h \
  %reldir%/ov-re-mat.h \
  %reldir%/ov-scalar.h \
  %reldir%/ov-str-mat.h \
  %reldir%/ov-struct.h \
  %reldir%/ov-typeinfo.h \
  %reldir%/ov-usr-fcn.h \
  %reldir%/ov.h \
  %reldir%/ovl.h \
  $(OV_INTTYPE_INC) \
  $(OV_SPARSE_INC)

OV_INTTYPE_SRC = \
  %reldir%/ov-int16.cc \
  %reldir%/ov-int32.cc \
  %reldir%/ov-int64.cc \
  %reldir%/ov-int8.cc \
  %reldir%/ov-uint16.cc \
  %reldir%/ov-uint32.cc \
  %reldir%/ov-uint64.cc \
  %reldir%/ov-uint8.cc

OV_SPARSE_SRC = \
  %reldir%/ov-bool-sparse.cc \
  %reldir%/ov-cx-sparse.cc \
  %reldir%/ov-re-sparse.cc

OCTAVE_VALUE_SRC = \
  %reldir%/cdef-class.cc \
  %reldir%/cdef-manager.cc \
  %reldir%/cdef-method.cc \
  %reldir%/cdef-object.cc \
  %reldir%/cdef-package.cc \
  %reldir%/cdef-property.cc \
  %reldir%/cdef-utils.cc \
  %reldir%/ov-base.cc \
  %reldir%/ov-bool-mat.cc \
  %reldir%/ov-bool.cc \
  %reldir%/ov-builtin.cc \
  %reldir%/ov-cell.cc \
  %reldir%/ov-ch-mat.cc \
  %reldir%/ov-class.cc \
  %reldir%/ov-classdef.cc \
  %reldir%/ov-colon.cc \
  %reldir%/ov-complex.cc \
  %reldir%/ov-cs-list.cc \
  %reldir%/ov-cx-diag.cc \
  %reldir%/ov-cx-mat.cc \
  %reldir%/ov-dld-fcn.cc \
  %reldir%/ov-fcn-handle.cc \
  %reldir%/ov-fcn.cc \
  %reldir%/ov-float.cc \
  %reldir%/ov-flt-complex.cc \
  %reldir%/ov-flt-cx-diag.cc \
  %reldir%/ov-flt-cx-mat.cc \
  %reldir%/ov-flt-re-diag.cc \
  %reldir%/ov-flt-re-mat.cc \
  %reldir%/ov-java.cc \
  %reldir%/ov-lazy-idx.cc \
  %reldir%/ov-mex-fcn.cc \
  %reldir%/ov-null-mat.cc \
  %reldir%/ov-oncleanup.cc \
  %reldir%/ov-perm.cc \
  %reldir%/ov-range.cc \
  %reldir%/ov-re-diag.cc \
  %reldir%/ov-re-mat.cc \
  %reldir%/ov-scalar.cc \
  %reldir%/ov-str-mat.cc \
  %reldir%/ov-struct.cc \
  %reldir%/ov-typeinfo.cc \
  %reldir%/ov-usr-fcn.cc \
  %reldir%/ov.cc \
  %reldir%/ovl.cc \
  $(OV_INTTYPE_SRC) \
  $(OV_SPARSE_SRC)

## These source files contain template definitions that are included
## in other files.  They are not supposed to be compiled separately,
## so they should not appear in the OCTAVE_VALUE_SRC list.

libinterp_EXTRA_DIST += \
  %reldir%/ov-base-diag.cc \
  %reldir%/ov-base-int.cc \
  %reldir%/ov-base-mat.cc \
  %reldir%/ov-base-scalar.cc \
  %reldir%/ov-base-sparse.cc

noinst_LTLIBRARIES += %reldir%/liboctave-value.la

%canon_reldir%_liboctave_value_la_SOURCES = $(OCTAVE_VALUE_SRC)

## FIXME: maybe it would be better to limit the JAVA flags to
## the compile commands for ov-java.cc?  Does JAVA_LIBS need to be
## added to LIBOCTINTERP_LINK_DEPS (see libinterp/link-deps.mk)?
## Should we have a separate set of JAVA_LDFLAGS?

%canon_reldir%_liboctave_value_la_CPPFLAGS = \
  $(libinterp_liboctinterp_la_CPPFLAGS) \
  $(HDF5_CPPFLAGS) \
  $(JAVA_CPPFLAGS)

%canon_reldir%_liboctave_value_la_LIBADD = $(JAVA_LIBS)