Mercurial > octave-nkf
view Makefile.am @ 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 | 110c7a54586b |
children |
line wrap: on
line source
# Makefile for Octave # # Copyright (C) 1993-2015 John W. Eaton # # This file is part of Octave. # # Octave is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by the # Free Software Foundation; either version 3 of the License, or (at # your option) any later version. # # Octave is distributed in the hope that it will be useful, but WITHOUT # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or # FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License # for more details. # # You should have received a copy of the GNU General Public License # along with Octave; see the file COPYING. If not, see # <http://www.gnu.org/licenses/>. include build-aux/common.mk image_DATA = octdata_DATA = octetc_DATA = octlocale_DATA = ACLOCAL_AMFLAGS = -I m4 DOC_TARGETS = BUILT_DISTFILES = BUILT_NODISTFILES = EXTRA_DIST = BUILT_DISTFILES += \ AUTHORS \ BUGS \ ChangeLog \ INSTALL.OCTAVE EXTRA_DIST += \ CITATION \ COPYING \ INSTALL \ NEWS \ README \ build-aux/OctJavaQry.class \ build-aux/find-files-with-tests.sh \ build-aux/mk-opts.pl \ build-aux/move-if-change \ build-aux/stl_algo.h-fixed \ run-octave.in \ $(BUILT_DISTFILES) DIRSTAMP_FILES = octave_dirstamp = $(am__leading_dot)octave-dirstamp $(DIRSTAMP_FILES): $(AM_V_GEN)$(MKDIR_P) $(@D) && \ : > $@ CLEANFILES = DISTCLEANFILES = MAINTAINERCLEANFILES = info_TEXINFOS = BUILT_SOURCES = TEST_FILES = DOC_IMAGES_SRC = BUILT_DOC_IMAGES = BUILT_DOC_IMAGES_EPS = BUILT_DOC_IMAGES_PDF = BUILT_DOC_IMAGES_PNG = BUILT_DOC_IMAGES_TXT = DOC_IMAGES = DOC_IMAGES_EPS = DOC_IMAGES_PDF = DOC_IMAGES_PNG = DOC_IMAGES_TXT = FCN_FILE_DIRS = FCN_FILES = GEN_FCN_FILES = PKG_ADD_FILES = SCRIPTS_IMAGES = JAR_FILES = DOCSTRING_FILES = bin_PROGRAMS = archlib_PROGRAMS = noinst_HEADERS = OCTAVE_VERSION_LINKS = OCTAVE_CROSS_TOOLS = OCTAVE_INTERPRETER_TARGETS = octlib_LTLIBRARIES = noinst_LTLIBRARIES = octinclude_HEADERS = nodist_octinclude_HEADERS = DIST_SRC = ALL_LOCAL_TARGETS = include liboctave/module.mk include liboctave/link-deps.mk include libinterp/module.mk include libinterp/link-deps.mk include libgui/module.mk include libgui/link-deps.mk include src/module.mk include scripts/module.mk include doc/module.mk include doc/interpreter/images.mk include etc/module.mk include examples/module.mk include m4/module.mk include test/module.mk # Subdirectories in which to run make recursively. Other # directories are handled directly from this Makefile (see also the # included makefile fragments). SUBDIRS = libgnu dist-hook: doc-interpreter-dist-hook docs-dist-hook icons-dist-hook scripts-dist-hook if AMCOND_BUILD_DOCS docs-dist-hook: else docs-dist-hook: @echo "Documentation disabled. Cannot package distribution!" ; exit 1; endif if AMCOND_HAVE_ICON_TOOLS icons-dist-hook: else icons-dist-hook: @echo "Packaging distribution requires icotool and rsvg-convert." ; exit 1; endif BUILT_SOURCES += \ run-octave \ $(DIRSTAMP_FILES) if AMCOND_HAVE_BROKEN_STL_ALGO_H BUILT_SOURCES += bits/stl_algo.h else BUILT_SOURCES += nonexistent-file endif noinst_SCRIPTS = run-octave OCTAVE_INTERPRETER_TARGETS += run-octave CLEANFILES += \ $(BUILT_SOURCES) DISTCLEANFILES += \ .gdbinit \ $(DIRSTAMP_FILES) MAINTAINERCLEANFILES += \ ChangeLog \ $(BUILT_DISTFILES) CONFIG_FILES = @ac_config_headers@ @ac_config_files@ octinclude_HEADERS += oct-conf-post.h nodist_octinclude_HEADERS += config.h all-local: $(ALL_LOCAL_TARGETS) $(noinst_SCRIPTS) $(DIST_INFO_FILES) .gdbinit $(DOC_TARGETS) @echo "" @echo "Octave successfully built. Now choose from the following:" @echo "" @echo " ./run-octave - to run in place to test before installing" @echo " make check - to run the tests" @echo " make install - to install (PREFIX=$(prefix))" @echo "" run-octave: run-octave.in Makefile $(AM_V_GEN)$(do_subst_script_vals) && \ chmod a+rx "$@" bits/stl_algo.h: build-aux/stl_algo.h-fixed $(AM_V_GEN)$(MKDIR_P) bits && \ $(INSTALL_HEADER) $< $@ ## If we aren't trying to fix stl_algo.h, then try to ensure that ## there isn't a stray copy sitting in the build tree. nonexistent-file: $(AM_V_at)rm -f bits/stl_algo.h .PHONY: nonexistent-file .gdbinit: etc/gdbinit @$(gdbinit_install_rule) define changelog-from-hg-log rm -f $@-t && \ if [ -d $(srcdir)/.hg ]; then \ ( cd $(srcdir); \ hg log --style=build-aux/changelog.tmpl --prune=b0e60ad4ae26 --only-branch=`hg branch`; \ echo ""; \ echo "See the files in the directory etc/OLD-ChangeLogs for changes before 2011-04-19"; \ ) > $@-t && \ mv $@-t $@; \ elif [ ! -f $@ ] && [ ! -f $(srcdir)/$@ ]; then \ echo "Empty ChangeLog generated because no hg log available" > $@-t && \ mv $@-t $@; \ fi endef ChangeLog: $(AM_V_GEN)$(changelog-from-hg-log) .PHONY: ChangeLog octetc_DATA += \ CITATION \ NEWS if AMCOND_INSTALL_BUILD_LOGS octetc_DATA += config.log endif DIRS_TO_MAKE = \ $(localfcnfiledir) \ $(localapifcnfiledir) \ $(localverfcnfiledir) \ $(localoctfiledir) \ $(localapioctfiledir) \ $(localveroctfiledir) \ $(localarchlibdir) \ $(localapiarchlibdir) \ $(localverarchlibdir) installdirs-local: $(MKDIR_P) $(addprefix $(DESTDIR), $(DIRS_TO_MAKE)) install-data-local: installdirs-local clean-local: doc-clean distclean-local: maintainer-clean-local: doc-maintainer-clean