Mercurial > hg > octave-lojdl
changeset 15057:46b19589b593
maint: Partition src/ directory with more code in subdirs.
Create new octave-value dir for ov* code.
Create new parse-tre dir for pt* code.
Move OPERATORS and TEMPLATE-INST directories to lowercase names
* octave-value/module.mk: Hook code in octave-value dir into build system.
* octave-value/ov-base-diag.cc,
octave-value/ov-base-diag.h, octave-value/ov-base-int.cc,
octave-value/ov-base-int.h, octave-value/ov-base-mat.cc,
octave-value/ov-base-mat.h, octave-value/ov-base-scalar.cc,
octave-value/ov-base-scalar.h, octave-value/ov-base-sparse.cc,
octave-value/ov-base-sparse.h, octave-value/ov-base.cc, octave-value/ov-base.h,
octave-value/ov-bool-mat.cc, octave-value/ov-bool-mat.h,
octave-value/ov-bool-sparse.cc, octave-value/ov-bool-sparse.h,
octave-value/ov-bool.cc, octave-value/ov-bool.h, octave-value/ov-builtin.cc,
octave-value/ov-builtin.h, octave-value/ov-cell.cc, octave-value/ov-cell.h,
octave-value/ov-ch-mat.cc, octave-value/ov-ch-mat.h, octave-value/ov-class.cc,
octave-value/ov-class.h, octave-value/ov-colon.cc, octave-value/ov-colon.h,
octave-value/ov-complex.cc, octave-value/ov-complex.h,
octave-value/ov-cs-list.cc, octave-value/ov-cs-list.h,
octave-value/ov-cx-diag.cc, octave-value/ov-cx-diag.h,
octave-value/ov-cx-mat.cc, octave-value/ov-cx-mat.h,
octave-value/ov-cx-sparse.cc, octave-value/ov-cx-sparse.h,
octave-value/ov-dld-fcn.cc, octave-value/ov-dld-fcn.h,
octave-value/ov-fcn-handle.cc, octave-value/ov-fcn-handle.h,
octave-value/ov-fcn-inline.cc, octave-value/ov-fcn-inline.h,
octave-value/ov-fcn.cc, octave-value/ov-fcn.h, octave-value/ov-float.cc,
octave-value/ov-float.h, octave-value/ov-flt-complex.cc,
octave-value/ov-flt-complex.h, octave-value/ov-flt-cx-diag.cc,
octave-value/ov-flt-cx-diag.h, octave-value/ov-flt-cx-mat.cc,
octave-value/ov-flt-cx-mat.h, octave-value/ov-flt-re-diag.cc,
octave-value/ov-flt-re-diag.h, octave-value/ov-flt-re-mat.cc,
octave-value/ov-flt-re-mat.h, octave-value/ov-int-traits.h,
octave-value/ov-int16.cc, octave-value/ov-int16.h, octave-value/ov-int32.cc,
octave-value/ov-int32.h, octave-value/ov-int64.cc, octave-value/ov-int64.h,
octave-value/ov-int8.cc, octave-value/ov-int8.h, octave-value/ov-intx.h,
octave-value/ov-lazy-idx.cc, octave-value/ov-lazy-idx.h,
octave-value/ov-mex-fcn.cc, octave-value/ov-mex-fcn.h,
octave-value/ov-null-mat.cc, octave-value/ov-null-mat.h,
octave-value/ov-oncleanup.cc, octave-value/ov-oncleanup.h,
octave-value/ov-perm.cc, octave-value/ov-perm.h, octave-value/ov-range.cc,
octave-value/ov-range.h, octave-value/ov-re-diag.cc, octave-value/ov-re-diag.h,
octave-value/ov-re-mat.cc, octave-value/ov-re-mat.h,
octave-value/ov-re-sparse.cc, octave-value/ov-re-sparse.h,
octave-value/ov-scalar.cc, octave-value/ov-scalar.h,
octave-value/ov-str-mat.cc, octave-value/ov-str-mat.h,
octave-value/ov-struct.cc, octave-value/ov-struct.h,
octave-value/ov-type-conv.h, octave-value/ov-typeinfo.cc,
octave-value/ov-typeinfo.h, octave-value/ov-uint16.cc,
octave-value/ov-uint16.h, octave-value/ov-uint32.cc, octave-value/ov-uint32.h,
octave-value/ov-uint64.cc, octave-value/ov-uint64.h, octave-value/ov-uint8.cc,
octave-value/ov-uint8.h, octave-value/ov-usr-fcn.cc, octave-value/ov-usr-fcn.h,
octave-value/ov.cc, octave-value/ov.h: Moved from src/ dir to octave-value dir.
* operators/module.mk, operators/op-b-b.cc, operators/op-b-bm.cc,
operators/op-b-sbm.cc, operators/op-bm-b.cc, operators/op-bm-bm.cc,
operators/op-bm-sbm.cc, operators/op-cdm-cdm.cc, operators/op-cdm-cm.cc,
operators/op-cdm-cs.cc, operators/op-cdm-dm.cc, operators/op-cdm-m.cc,
operators/op-cdm-s.cc, operators/op-cell.cc, operators/op-chm.cc,
operators/op-class.cc, operators/op-cm-cdm.cc, operators/op-cm-cm.cc,
operators/op-cm-cs.cc, operators/op-cm-dm.cc, operators/op-cm-m.cc,
operators/op-cm-pm.cc, operators/op-cm-s.cc, operators/op-cm-scm.cc,
operators/op-cm-sm.cc, operators/op-cs-cm.cc, operators/op-cs-cs.cc,
operators/op-cs-m.cc, operators/op-cs-s.cc, operators/op-cs-scm.cc,
operators/op-cs-sm.cc, operators/op-dm-cdm.cc, operators/op-dm-cm.cc,
operators/op-dm-cs.cc, operators/op-dm-dm.cc, operators/op-dm-m.cc,
operators/op-dm-s.cc, operators/op-dm-scm.cc, operators/op-dm-sm.cc,
operators/op-dm-template.cc, operators/op-dms-template.cc,
operators/op-double-conv.cc, operators/op-fcdm-fcdm.cc,
operators/op-fcdm-fcm.cc, operators/op-fcdm-fcs.cc, operators/op-fcdm-fdm.cc,
operators/op-fcdm-fm.cc, operators/op-fcdm-fs.cc, operators/op-fcm-fcdm.cc,
operators/op-fcm-fcm.cc, operators/op-fcm-fcs.cc, operators/op-fcm-fdm.cc,
operators/op-fcm-fm.cc, operators/op-fcm-fs.cc, operators/op-fcm-pm.cc,
operators/op-fcn.cc, operators/op-fcs-fcm.cc, operators/op-fcs-fcs.cc,
operators/op-fcs-fm.cc, operators/op-fcs-fs.cc, operators/op-fdm-fcdm.cc,
operators/op-fdm-fcm.cc, operators/op-fdm-fcs.cc, operators/op-fdm-fdm.cc,
operators/op-fdm-fm.cc, operators/op-fdm-fs.cc, operators/op-float-conv.cc,
operators/op-fm-fcdm.cc, operators/op-fm-fcm.cc, operators/op-fm-fcs.cc,
operators/op-fm-fdm.cc, operators/op-fm-fm.cc, operators/op-fm-fs.cc,
operators/op-fm-pm.cc, operators/op-fs-fcm.cc, operators/op-fs-fcs.cc,
operators/op-fs-fm.cc, operators/op-fs-fs.cc, operators/op-i16-i16.cc,
operators/op-i32-i32.cc, operators/op-i64-i64.cc, operators/op-i8-i8.cc,
operators/op-int-concat.cc, operators/op-int-conv.cc, operators/op-int.h,
operators/op-m-cdm.cc, operators/op-m-cm.cc, operators/op-m-cs.cc,
operators/op-m-dm.cc, operators/op-m-m.cc, operators/op-m-pm.cc,
operators/op-m-s.cc, operators/op-m-scm.cc, operators/op-m-sm.cc,
operators/op-pm-cm.cc, operators/op-pm-fcm.cc, operators/op-pm-fm.cc,
operators/op-pm-m.cc, operators/op-pm-pm.cc, operators/op-pm-scm.cc,
operators/op-pm-sm.cc, operators/op-pm-template.cc, operators/op-range.cc,
operators/op-s-cm.cc, operators/op-s-cs.cc, operators/op-s-m.cc,
operators/op-s-s.cc, operators/op-s-scm.cc, operators/op-s-sm.cc,
operators/op-sbm-b.cc, operators/op-sbm-bm.cc, operators/op-sbm-sbm.cc,
operators/op-scm-cm.cc, operators/op-scm-cs.cc, operators/op-scm-m.cc,
operators/op-scm-s.cc, operators/op-scm-scm.cc, operators/op-scm-sm.cc,
operators/op-sm-cm.cc, operators/op-sm-cs.cc, operators/op-sm-m.cc,
operators/op-sm-s.cc, operators/op-sm-scm.cc, operators/op-sm-sm.cc,
operators/op-str-m.cc, operators/op-str-s.cc, operators/op-str-str.cc,
operators/op-struct.cc, operators/op-ui16-ui16.cc, operators/op-ui32-ui32.cc,
operators/op-ui64-ui64.cc, operators/op-ui8-ui8.cc: Moved from OPERATORS/
dir to operators/ directory.
* mkops: Correctly print comment in generated file ops.cc that it is made by
mkops. Change sed expression for OPERATORS/ to operators/.
* parse-tree/module.mk: Hook code in parse-tree dir into build system.
* parse-tree/pt-all.h, parse-tree/pt-arg-list.cc, parse-tree/pt-arg-list.h,
parse-tree/pt-assign.cc, parse-tree/pt-assign.h, parse-tree/pt-binop.cc,
parse-tree/pt-binop.h, parse-tree/pt-bp.cc, parse-tree/pt-bp.h,
parse-tree/pt-cbinop.cc, parse-tree/pt-cbinop.h, parse-tree/pt-cell.cc,
parse-tree/pt-cell.h, parse-tree/pt-check.cc, parse-tree/pt-check.h,
parse-tree/pt-cmd.cc, parse-tree/pt-cmd.h, parse-tree/pt-colon.cc,
parse-tree/pt-colon.h, parse-tree/pt-const.cc, parse-tree/pt-const.h,
parse-tree/pt-decl.cc, parse-tree/pt-decl.h, parse-tree/pt-eval.cc,
parse-tree/pt-eval.h, parse-tree/pt-except.cc, parse-tree/pt-except.h,
parse-tree/pt-exp.cc, parse-tree/pt-exp.h, parse-tree/pt-fcn-handle.cc,
parse-tree/pt-fcn-handle.h, parse-tree/pt-id.cc, parse-tree/pt-id.h,
parse-tree/pt-idx.cc, parse-tree/pt-idx.h, parse-tree/pt-jump.cc,
parse-tree/pt-jump.h, parse-tree/pt-loop.cc, parse-tree/pt-loop.h,
parse-tree/pt-mat.cc, parse-tree/pt-mat.h, parse-tree/pt-misc.cc,
parse-tree/pt-misc.h, parse-tree/pt-pr-code.cc, parse-tree/pt-pr-code.h,
parse-tree/pt-select.cc, parse-tree/pt-select.h, parse-tree/pt-stmt.cc,
parse-tree/pt-stmt.h, parse-tree/pt-unop.cc, parse-tree/pt-unop.h,
parse-tree/pt-walk.h, parse-tree/pt.cc, parse-tree/pt.h:
Moved from src/ dir to parse-tree dir.
* template-inst/Array-jit.cc, template-inst/Array-os.cc,
template-inst/Array-sym.cc, template-inst/Array-tc.cc, template-inst/module.mk:
Moved from TEMPLATE-INST dir to template-inst/ directory.
* src/Makefile.am: Add new directories to build system.
* corefcn/module.mk: Use COREFCN_SRC with all capitals to indicate it is not an
Automake special target.
line wrap: on
line diff
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -25,6 +25,8 @@ -I../libgnu -I$(top_srcdir)/libgnu \ -I$(top_srcdir)/libcruft/misc \ -I../liboctave -I$(top_srcdir)/liboctave \ + -Ioctave-value -I$(srcdir)/octave-value \ + -Iparse-tree -I$(srcdir)/parse-tree \ -Icorefcn -I$(srcdir)/corefcn \ -I. -I$(srcdir) \ @CPPFLAGS@ @@ -135,103 +137,6 @@ ../liboctave/LSODE-opts.h \ ../liboctave/Quad-opts.h -OV_INTTYPE_INC = \ - ov-base-int.h \ - ov-base-int.cc \ - ov-int-traits.h \ - ov-int16.h \ - ov-int32.h \ - ov-int64.h \ - ov-int8.h \ - ov-intx.h \ - ov-uint16.h \ - ov-uint32.h \ - ov-uint64.h \ - ov-uint8.h - -OV_INCLUDES = \ - ov-base-diag.h \ - ov-base-diag.cc \ - ov-base-mat.h \ - ov-base-mat.cc \ - ov-base-scalar.h \ - ov-base-scalar.cc \ - ov-base.h \ - ov-bool-mat.h \ - ov-bool-mat.cc \ - ov-bool.h \ - ov-builtin.h \ - ov-cell.h \ - ov-ch-mat.h \ - ov-class.h \ - ov-colon.h \ - ov-complex.h \ - ov-cs-list.h \ - ov-cx-diag.h \ - ov-cx-mat.h \ - ov-dld-fcn.h \ - ov-fcn-handle.h \ - ov-fcn-inline.h \ - ov-fcn.h \ - ov-float.h \ - ov-flt-complex.h \ - ov-flt-cx-diag.h \ - ov-flt-cx-mat.h \ - ov-flt-re-diag.h \ - ov-flt-re-mat.h \ - ov-lazy-idx.h \ - ov-mex-fcn.h \ - ov-null-mat.h \ - ov-oncleanup.h \ - ov-perm.h \ - ov-range.h \ - ov-re-diag.h \ - ov-re-mat.h \ - ov-scalar.h \ - ov-str-mat.h \ - ov-struct.h \ - ov-type-conv.h \ - ov-typeinfo.h \ - ov-usr-fcn.h \ - ov.h \ - $(OV_INTTYPE_INC) - -OV_SPARSE_INCLUDES = \ - ov-base-sparse.h \ - ov-bool-sparse.h \ - ov-cx-sparse.h \ - ov-re-sparse.h - -PT_INCLUDES = \ - pt-all.h \ - pt-arg-list.h \ - pt-assign.h \ - pt-binop.h \ - pt-bp.h \ - pt-cbinop.h \ - pt-cell.h \ - pt-check.h \ - pt-cmd.h \ - pt-colon.h \ - pt-const.h \ - pt-decl.h \ - pt-eval.h \ - pt-except.h \ - pt-exp.h \ - pt-fcn-handle.h \ - pt-id.h \ - pt-idx.h \ - pt-jump.h \ - pt-loop.h \ - pt-mat.h \ - pt-misc.h \ - pt-pr-code.h \ - pt-select.h \ - pt-stmt.h \ - pt-unop.h \ - pt-walk.h \ - pt.h - JIT_INCLUDES = \ jit-util.h \ jit-typeinfo.h \ @@ -326,90 +231,6 @@ mxarray.h \ version.h -OV_INTTYPE_SRC = \ - ov-int16.cc \ - ov-int32.cc \ - ov-int64.cc \ - ov-int8.cc \ - ov-uint16.cc \ - ov-uint32.cc \ - ov-uint64.cc \ - ov-uint8.cc - -OV_SPARSE_SRC = \ - ov-base-sparse.cc \ - ov-bool-sparse.cc \ - ov-cx-sparse.cc \ - ov-re-sparse.cc - -OV_SRC = \ - ov-base.cc \ - ov-bool-mat.cc \ - ov-bool.cc \ - ov-builtin.cc \ - ov-cell.cc \ - ov-ch-mat.cc \ - ov-class.cc \ - ov-colon.cc \ - ov-complex.cc \ - ov-cs-list.cc \ - ov-cx-diag.cc \ - ov-cx-mat.cc \ - ov-dld-fcn.cc \ - ov-fcn-handle.cc \ - ov-fcn-inline.cc \ - ov-fcn.cc \ - ov-float.cc \ - ov-flt-complex.cc \ - ov-flt-cx-diag.cc \ - ov-flt-cx-mat.cc \ - ov-flt-re-diag.cc \ - ov-flt-re-mat.cc \ - ov-lazy-idx.cc \ - ov-mex-fcn.cc \ - ov-null-mat.cc \ - ov-oncleanup.cc \ - ov-perm.cc \ - ov-range.cc \ - ov-re-diag.cc \ - ov-re-mat.cc \ - ov-scalar.cc \ - ov-str-mat.cc \ - ov-struct.cc \ - ov-typeinfo.cc \ - ov-usr-fcn.cc \ - ov.cc \ - $(OV_INTTYPE_SRC) \ - $(OV_SPARSE_SRC) - -PT_SRC = \ - pt-arg-list.cc \ - pt-assign.cc \ - pt-binop.cc \ - pt-bp.cc \ - pt-cbinop.cc \ - pt-cell.cc \ - pt-check.cc \ - pt-cmd.cc \ - pt-colon.cc \ - pt-const.cc \ - pt-decl.cc \ - pt-eval.cc \ - pt-except.cc \ - pt-exp.cc \ - pt-fcn-handle.cc \ - pt-id.cc \ - pt-idx.cc \ - pt-jump.cc \ - pt-loop.cc \ - pt-mat.cc \ - pt-misc.cc \ - pt-pr-code.cc \ - pt-select.cc \ - pt-stmt.cc \ - pt-unop.cc \ - pt.cc - JIT_SRC = \ jit-util.cc \ jit-typeinfo.cc \ @@ -487,22 +308,23 @@ xnorm.cc \ xpow.cc \ zfstream.cc \ - $(corefcn_SRC) \ - $(OV_SRC) \ - $(PT_SRC) \ + $(COREFCN_SRC) \ + $(OCTAVE_VALUE_SRC) \ + $(PARSE_TREE_SRC) \ $(JIT_SRC) noinst_LTLIBRARIES = +include parse-tree/module.mk +include octave-value/module.mk +include operators/module.mk +include template-inst/module.mk include corefcn/module.mk include DLD-FUNCTIONS/module.mk $(srcdir)/DLD-FUNCTIONS/module.mk: $(srcdir)/DLD-FUNCTIONS/config-module.sh $(srcdir)/DLD-FUNCTIONS/config-module.awk $(srcdir)/DLD-FUNCTIONS/module-files $(srcdir)/DLD-FUNCTIONS/config-module.sh $(top_srcdir) -include OPERATORS/module.mk -include TEMPLATE-INST/module.mk - if AMCOND_ENABLE_DYNAMIC_LINKING OCT_FILES = $(DLD_FUNCTIONS_LIBS:.la=.oct) OCT_STAMP_FILES = $(subst DLD-FUNCTIONS/,DLD-FUNCTIONS/$(am__leading_dot),$(DLD_FUNCTIONS_LIBS:.la=.oct-stamp))
--- a/src/corefcn/module.mk +++ b/src/corefcn/module.mk @@ -1,7 +1,7 @@ EXTRA_DIST += \ corefcn/module.mk -corefcn_SRC = \ +COREFCN_SRC = \ corefcn/__contourc__.cc \ corefcn/__dispatch__.cc \ corefcn/__lin_interpn__.cc \ @@ -66,5 +66,5 @@ noinst_LTLIBRARIES += corefcn/libcorefcn.la -corefcn_libcorefcn_la_SOURCES = $(corefcn_SRC) +corefcn_libcorefcn_la_SOURCES = $(COREFCN_SRC)
--- a/src/mkops +++ b/src/mkops @@ -21,7 +21,7 @@ SED=${SED:-'sed'} cat << \EOF -// DO NOT EDIT! Generated automatically by mkbuiltins. +// DO NOT EDIT! Generated automatically by mkops. #ifdef HAVE_CONFIG_H #include "config.h" @@ -32,7 +32,7 @@ EOF for file in "$@"; do - f=`echo $file | $SED 's,^\./,,; s%^OPERATORS/op-%%; s%\.cc%%; s%-%_%g'` + f=`echo $file | $SED 's,^\./,,; s%^operators/op-%%; s%\.cc%%; s%-%_%g'` echo "extern void install_${f}_ops (void);" done @@ -46,7 +46,7 @@ EOF for file in "$@"; do - f=`echo $file | $SED 's,^\./,,; s%^OPERATORS/op-%%; s%\.cc%%; s%-%_%g'` + f=`echo $file | $SED 's,^\./,,; s%^operators/op-%%; s%\.cc%%; s%-%_%g'` echo " install_${f}_ops ();" done
new file mode 100644 --- /dev/null +++ b/src/octave-value/module.mk @@ -0,0 +1,126 @@ +EXTRA_DIST += \ + octave-value/module.mk + +OV_INTTYPE_INCLUDES = \ + octave-value/ov-base-int.h \ + octave-value/ov-base-int.cc \ + octave-value/ov-int-traits.h \ + octave-value/ov-int16.h \ + octave-value/ov-int32.h \ + octave-value/ov-int64.h \ + octave-value/ov-int8.h \ + octave-value/ov-intx.h \ + octave-value/ov-uint16.h \ + octave-value/ov-uint32.h \ + octave-value/ov-uint64.h \ + octave-value/ov-uint8.h + +OV_SPARSE_INCLUDES = \ + octave-value/ov-base-sparse.h \ + octave-value/ov-bool-sparse.h \ + octave-value/ov-cx-sparse.h \ + octave-value/ov-re-sparse.h + +OV_INCLUDES = \ + octave-value/ov-base-diag.h \ + octave-value/ov-base-diag.cc \ + octave-value/ov-base-mat.h \ + octave-value/ov-base-mat.cc \ + octave-value/ov-base-scalar.h \ + octave-value/ov-base-scalar.cc \ + octave-value/ov-base.h \ + octave-value/ov-bool-mat.h \ + octave-value/ov-bool-mat.cc \ + octave-value/ov-bool.h \ + octave-value/ov-builtin.h \ + octave-value/ov-cell.h \ + octave-value/ov-ch-mat.h \ + octave-value/ov-class.h \ + octave-value/ov-colon.h \ + octave-value/ov-complex.h \ + octave-value/ov-cs-list.h \ + octave-value/ov-cx-diag.h \ + octave-value/ov-cx-mat.h \ + octave-value/ov-dld-fcn.h \ + octave-value/ov-fcn-handle.h \ + octave-value/ov-fcn-inline.h \ + octave-value/ov-fcn.h \ + octave-value/ov-float.h \ + octave-value/ov-flt-complex.h \ + octave-value/ov-flt-cx-diag.h \ + octave-value/ov-flt-cx-mat.h \ + octave-value/ov-flt-re-diag.h \ + octave-value/ov-flt-re-mat.h \ + octave-value/ov-lazy-idx.h \ + octave-value/ov-mex-fcn.h \ + octave-value/ov-null-mat.h \ + octave-value/ov-oncleanup.h \ + octave-value/ov-perm.h \ + octave-value/ov-range.h \ + octave-value/ov-re-diag.h \ + octave-value/ov-re-mat.h \ + octave-value/ov-scalar.h \ + octave-value/ov-str-mat.h \ + octave-value/ov-struct.h \ + octave-value/ov-type-conv.h \ + octave-value/ov-typeinfo.h \ + octave-value/ov-usr-fcn.h \ + octave-value/ov.h \ + $(OV_INTTYPE_INCLUDES) + +OV_INTTYPE_SRC = \ + octave-value/ov-int16.cc \ + octave-value/ov-int32.cc \ + octave-value/ov-int64.cc \ + octave-value/ov-int8.cc \ + octave-value/ov-uint16.cc \ + octave-value/ov-uint32.cc \ + octave-value/ov-uint64.cc \ + octave-value/ov-uint8.cc + +OV_SPARSE_SRC = \ + octave-value/ov-base-sparse.cc \ + octave-value/ov-bool-sparse.cc \ + octave-value/ov-cx-sparse.cc \ + octave-value/ov-re-sparse.cc + +OCTAVE_VALUE_SRC = \ + octave-value/ov-base.cc \ + octave-value/ov-bool-mat.cc \ + octave-value/ov-bool.cc \ + octave-value/ov-builtin.cc \ + octave-value/ov-cell.cc \ + octave-value/ov-ch-mat.cc \ + octave-value/ov-class.cc \ + octave-value/ov-colon.cc \ + octave-value/ov-complex.cc \ + octave-value/ov-cs-list.cc \ + octave-value/ov-cx-diag.cc \ + octave-value/ov-cx-mat.cc \ + octave-value/ov-dld-fcn.cc \ + octave-value/ov-fcn-handle.cc \ + octave-value/ov-fcn-inline.cc \ + octave-value/ov-fcn.cc \ + octave-value/ov-float.cc \ + octave-value/ov-flt-complex.cc \ + octave-value/ov-flt-cx-diag.cc \ + octave-value/ov-flt-cx-mat.cc \ + octave-value/ov-flt-re-diag.cc \ + octave-value/ov-flt-re-mat.cc \ + octave-value/ov-lazy-idx.cc \ + octave-value/ov-mex-fcn.cc \ + octave-value/ov-null-mat.cc \ + octave-value/ov-oncleanup.cc \ + octave-value/ov-perm.cc \ + octave-value/ov-range.cc \ + octave-value/ov-re-diag.cc \ + octave-value/ov-re-mat.cc \ + octave-value/ov-scalar.cc \ + octave-value/ov-str-mat.cc \ + octave-value/ov-struct.cc \ + octave-value/ov-typeinfo.cc \ + octave-value/ov-usr-fcn.cc \ + octave-value/ov.cc \ + $(OV_INTTYPE_SRC) \ + $(OV_SPARSE_SRC) +
rename from src/OPERATORS/module.mk rename to src/operators/module.mk --- a/src/OPERATORS/module.mk +++ b/src/operators/module.mk @@ -1,136 +1,136 @@ -EXTRA_DIST += OPERATORS/module.mk +EXTRA_DIST += operators/module.mk OPERATORS_SRC = \ - OPERATORS/op-b-b.cc \ - OPERATORS/op-b-bm.cc \ - OPERATORS/op-b-sbm.cc \ - OPERATORS/op-bm-b.cc \ - OPERATORS/op-bm-bm.cc \ - OPERATORS/op-bm-sbm.cc \ - OPERATORS/op-cdm-cdm.cc \ - OPERATORS/op-cdm-cm.cc \ - OPERATORS/op-cdm-cs.cc \ - OPERATORS/op-cdm-dm.cc \ - OPERATORS/op-cdm-m.cc \ - OPERATORS/op-cdm-s.cc \ - OPERATORS/op-cell.cc \ - OPERATORS/op-chm.cc \ - OPERATORS/op-class.cc \ - OPERATORS/op-cm-cdm.cc \ - OPERATORS/op-cm-cm.cc \ - OPERATORS/op-cm-cs.cc \ - OPERATORS/op-cm-dm.cc \ - OPERATORS/op-cm-m.cc \ - OPERATORS/op-cm-pm.cc \ - OPERATORS/op-cm-s.cc \ - OPERATORS/op-cm-scm.cc \ - OPERATORS/op-cm-sm.cc \ - OPERATORS/op-cs-cm.cc \ - OPERATORS/op-cs-cs.cc \ - OPERATORS/op-cs-m.cc \ - OPERATORS/op-cs-s.cc \ - OPERATORS/op-cs-scm.cc \ - OPERATORS/op-cs-sm.cc \ - OPERATORS/op-dm-cdm.cc \ - OPERATORS/op-dm-cm.cc \ - OPERATORS/op-dm-cs.cc \ - OPERATORS/op-dm-dm.cc \ - OPERATORS/op-dm-m.cc \ - OPERATORS/op-dm-s.cc \ - OPERATORS/op-dm-scm.cc \ - OPERATORS/op-dm-sm.cc \ - OPERATORS/op-double-conv.cc \ - OPERATORS/op-fcdm-fcdm.cc \ - OPERATORS/op-fcdm-fcm.cc \ - OPERATORS/op-fcdm-fcs.cc \ - OPERATORS/op-fcdm-fdm.cc \ - OPERATORS/op-fcdm-fm.cc \ - OPERATORS/op-fcdm-fs.cc \ - OPERATORS/op-fcm-fcdm.cc \ - OPERATORS/op-fcm-fcm.cc \ - OPERATORS/op-fcm-fcs.cc \ - OPERATORS/op-fcm-fdm.cc \ - OPERATORS/op-fcm-fm.cc \ - OPERATORS/op-fcm-fs.cc \ - OPERATORS/op-fcm-pm.cc \ - OPERATORS/op-fcn.cc \ - OPERATORS/op-fcs-fcm.cc \ - OPERATORS/op-fcs-fcs.cc \ - OPERATORS/op-fcs-fm.cc \ - OPERATORS/op-fcs-fs.cc \ - OPERATORS/op-fdm-fcdm.cc \ - OPERATORS/op-fdm-fcm.cc \ - OPERATORS/op-fdm-fcs.cc \ - OPERATORS/op-fdm-fdm.cc \ - OPERATORS/op-fdm-fm.cc \ - OPERATORS/op-fdm-fs.cc \ - OPERATORS/op-float-conv.cc \ - OPERATORS/op-fm-fcdm.cc \ - OPERATORS/op-fm-fcm.cc \ - OPERATORS/op-fm-fcs.cc \ - OPERATORS/op-fm-fdm.cc \ - OPERATORS/op-fm-fm.cc \ - OPERATORS/op-fm-fs.cc \ - OPERATORS/op-fm-pm.cc \ - OPERATORS/op-fs-fcm.cc \ - OPERATORS/op-fs-fcs.cc \ - OPERATORS/op-fs-fm.cc \ - OPERATORS/op-fs-fs.cc \ - OPERATORS/op-i16-i16.cc \ - OPERATORS/op-i32-i32.cc \ - OPERATORS/op-i64-i64.cc \ - OPERATORS/op-i8-i8.cc \ - OPERATORS/op-int-concat.cc \ - OPERATORS/op-int-conv.cc \ - OPERATORS/op-m-cdm.cc \ - OPERATORS/op-m-cm.cc \ - OPERATORS/op-m-cs.cc \ - OPERATORS/op-m-dm.cc \ - OPERATORS/op-m-m.cc \ - OPERATORS/op-m-pm.cc \ - OPERATORS/op-m-s.cc \ - OPERATORS/op-m-scm.cc \ - OPERATORS/op-m-sm.cc \ - OPERATORS/op-pm-cm.cc \ - OPERATORS/op-pm-fcm.cc \ - OPERATORS/op-pm-fm.cc \ - OPERATORS/op-pm-m.cc \ - OPERATORS/op-pm-pm.cc \ - OPERATORS/op-pm-scm.cc \ - OPERATORS/op-pm-sm.cc \ - OPERATORS/op-range.cc \ - OPERATORS/op-s-cm.cc \ - OPERATORS/op-s-cs.cc \ - OPERATORS/op-s-m.cc \ - OPERATORS/op-s-s.cc \ - OPERATORS/op-s-scm.cc \ - OPERATORS/op-s-sm.cc \ - OPERATORS/op-sbm-b.cc \ - OPERATORS/op-sbm-bm.cc \ - OPERATORS/op-sbm-sbm.cc \ - OPERATORS/op-scm-cm.cc \ - OPERATORS/op-scm-cs.cc \ - OPERATORS/op-scm-m.cc \ - OPERATORS/op-scm-s.cc \ - OPERATORS/op-scm-scm.cc \ - OPERATORS/op-scm-sm.cc \ - OPERATORS/op-sm-cm.cc \ - OPERATORS/op-sm-cs.cc \ - OPERATORS/op-sm-m.cc \ - OPERATORS/op-sm-s.cc \ - OPERATORS/op-sm-scm.cc \ - OPERATORS/op-sm-sm.cc \ - OPERATORS/op-str-m.cc \ - OPERATORS/op-str-s.cc \ - OPERATORS/op-str-str.cc \ - OPERATORS/op-struct.cc \ - OPERATORS/op-ui16-ui16.cc \ - OPERATORS/op-ui32-ui32.cc \ - OPERATORS/op-ui64-ui64.cc \ - OPERATORS/op-ui8-ui8.cc + operators/op-b-b.cc \ + operators/op-b-bm.cc \ + operators/op-b-sbm.cc \ + operators/op-bm-b.cc \ + operators/op-bm-bm.cc \ + operators/op-bm-sbm.cc \ + operators/op-cdm-cdm.cc \ + operators/op-cdm-cm.cc \ + operators/op-cdm-cs.cc \ + operators/op-cdm-dm.cc \ + operators/op-cdm-m.cc \ + operators/op-cdm-s.cc \ + operators/op-cell.cc \ + operators/op-chm.cc \ + operators/op-class.cc \ + operators/op-cm-cdm.cc \ + operators/op-cm-cm.cc \ + operators/op-cm-cs.cc \ + operators/op-cm-dm.cc \ + operators/op-cm-m.cc \ + operators/op-cm-pm.cc \ + operators/op-cm-s.cc \ + operators/op-cm-scm.cc \ + operators/op-cm-sm.cc \ + operators/op-cs-cm.cc \ + operators/op-cs-cs.cc \ + operators/op-cs-m.cc \ + operators/op-cs-s.cc \ + operators/op-cs-scm.cc \ + operators/op-cs-sm.cc \ + operators/op-dm-cdm.cc \ + operators/op-dm-cm.cc \ + operators/op-dm-cs.cc \ + operators/op-dm-dm.cc \ + operators/op-dm-m.cc \ + operators/op-dm-s.cc \ + operators/op-dm-scm.cc \ + operators/op-dm-sm.cc \ + operators/op-double-conv.cc \ + operators/op-fcdm-fcdm.cc \ + operators/op-fcdm-fcm.cc \ + operators/op-fcdm-fcs.cc \ + operators/op-fcdm-fdm.cc \ + operators/op-fcdm-fm.cc \ + operators/op-fcdm-fs.cc \ + operators/op-fcm-fcdm.cc \ + operators/op-fcm-fcm.cc \ + operators/op-fcm-fcs.cc \ + operators/op-fcm-fdm.cc \ + operators/op-fcm-fm.cc \ + operators/op-fcm-fs.cc \ + operators/op-fcm-pm.cc \ + operators/op-fcn.cc \ + operators/op-fcs-fcm.cc \ + operators/op-fcs-fcs.cc \ + operators/op-fcs-fm.cc \ + operators/op-fcs-fs.cc \ + operators/op-fdm-fcdm.cc \ + operators/op-fdm-fcm.cc \ + operators/op-fdm-fcs.cc \ + operators/op-fdm-fdm.cc \ + operators/op-fdm-fm.cc \ + operators/op-fdm-fs.cc \ + operators/op-float-conv.cc \ + operators/op-fm-fcdm.cc \ + operators/op-fm-fcm.cc \ + operators/op-fm-fcs.cc \ + operators/op-fm-fdm.cc \ + operators/op-fm-fm.cc \ + operators/op-fm-fs.cc \ + operators/op-fm-pm.cc \ + operators/op-fs-fcm.cc \ + operators/op-fs-fcs.cc \ + operators/op-fs-fm.cc \ + operators/op-fs-fs.cc \ + operators/op-i16-i16.cc \ + operators/op-i32-i32.cc \ + operators/op-i64-i64.cc \ + operators/op-i8-i8.cc \ + operators/op-int-concat.cc \ + operators/op-int-conv.cc \ + operators/op-m-cdm.cc \ + operators/op-m-cm.cc \ + operators/op-m-cs.cc \ + operators/op-m-dm.cc \ + operators/op-m-m.cc \ + operators/op-m-pm.cc \ + operators/op-m-s.cc \ + operators/op-m-scm.cc \ + operators/op-m-sm.cc \ + operators/op-pm-cm.cc \ + operators/op-pm-fcm.cc \ + operators/op-pm-fm.cc \ + operators/op-pm-m.cc \ + operators/op-pm-pm.cc \ + operators/op-pm-scm.cc \ + operators/op-pm-sm.cc \ + operators/op-range.cc \ + operators/op-s-cm.cc \ + operators/op-s-cs.cc \ + operators/op-s-m.cc \ + operators/op-s-s.cc \ + operators/op-s-scm.cc \ + operators/op-s-sm.cc \ + operators/op-sbm-b.cc \ + operators/op-sbm-bm.cc \ + operators/op-sbm-sbm.cc \ + operators/op-scm-cm.cc \ + operators/op-scm-cs.cc \ + operators/op-scm-m.cc \ + operators/op-scm-s.cc \ + operators/op-scm-scm.cc \ + operators/op-scm-sm.cc \ + operators/op-sm-cm.cc \ + operators/op-sm-cs.cc \ + operators/op-sm-m.cc \ + operators/op-sm-s.cc \ + operators/op-sm-scm.cc \ + operators/op-sm-sm.cc \ + operators/op-str-m.cc \ + operators/op-str-s.cc \ + operators/op-str-str.cc \ + operators/op-struct.cc \ + operators/op-ui16-ui16.cc \ + operators/op-ui32-ui32.cc \ + operators/op-ui64-ui64.cc \ + operators/op-ui8-ui8.cc octinclude_HEADERS += \ - OPERATORS/op-dm-template.cc \ - OPERATORS/op-dms-template.cc \ - OPERATORS/op-int.h \ - OPERATORS/op-pm-template.cc + operators/op-dm-template.cc \ + operators/op-dms-template.cc \ + operators/op-int.h \ + operators/op-pm-template.cc
new file mode 100644 --- /dev/null +++ b/src/parse-tree/module.mk @@ -0,0 +1,61 @@ +EXTRA_DIST += \ + parse-tree/module.mk + +PT_INCLUDES = \ + parse-tree/pt-all.h \ + parse-tree/pt-arg-list.h \ + parse-tree/pt-assign.h \ + parse-tree/pt-binop.h \ + parse-tree/pt-bp.h \ + parse-tree/pt-cbinop.h \ + parse-tree/pt-cell.h \ + parse-tree/pt-check.h \ + parse-tree/pt-cmd.h \ + parse-tree/pt-colon.h \ + parse-tree/pt-const.h \ + parse-tree/pt-decl.h \ + parse-tree/pt-eval.h \ + parse-tree/pt-except.h \ + parse-tree/pt-exp.h \ + parse-tree/pt-fcn-handle.h \ + parse-tree/pt-id.h \ + parse-tree/pt-idx.h \ + parse-tree/pt-jump.h \ + parse-tree/pt-loop.h \ + parse-tree/pt-mat.h \ + parse-tree/pt-misc.h \ + parse-tree/pt-pr-code.h \ + parse-tree/pt-select.h \ + parse-tree/pt-stmt.h \ + parse-tree/pt-unop.h \ + parse-tree/pt-walk.h \ + parse-tree/pt.h + +PARSE_TREE_SRC = \ + parse-tree/pt-arg-list.cc \ + parse-tree/pt-assign.cc \ + parse-tree/pt-binop.cc \ + parse-tree/pt-bp.cc \ + parse-tree/pt-cbinop.cc \ + parse-tree/pt-cell.cc \ + parse-tree/pt-check.cc \ + parse-tree/pt-cmd.cc \ + parse-tree/pt-colon.cc \ + parse-tree/pt-const.cc \ + parse-tree/pt-decl.cc \ + parse-tree/pt-eval.cc \ + parse-tree/pt-except.cc \ + parse-tree/pt-exp.cc \ + parse-tree/pt-fcn-handle.cc \ + parse-tree/pt-id.cc \ + parse-tree/pt-idx.cc \ + parse-tree/pt-jump.cc \ + parse-tree/pt-loop.cc \ + parse-tree/pt-mat.cc \ + parse-tree/pt-misc.cc \ + parse-tree/pt-pr-code.cc \ + parse-tree/pt-select.cc \ + parse-tree/pt-stmt.cc \ + parse-tree/pt-unop.cc \ + parse-tree/pt.cc +
rename from src/TEMPLATE-INST/module.mk rename to src/template-inst/module.mk --- a/src/TEMPLATE-INST/module.mk +++ b/src/template-inst/module.mk @@ -1,6 +1,6 @@ -EXTRA_DIST += TEMPLATE-INST/module.mk +EXTRA_DIST += template-inst/module.mk TEMPLATE_INST_SRC = \ - TEMPLATE-INST/Array-os.cc \ - TEMPLATE-INST/Array-tc.cc \ - TEMPLATE-INST/Array-jit.cc + template-inst/Array-os.cc \ + template-inst/Array-tc.cc \ + template-inst/Array-jit.cc