view libinterp/parse-tree/module.mk @ 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 9b44691a3520
children
line wrap: on
line source

PARSER_INC = \
  libinterp/parse-tree/lex.h \
  libinterp/parse-tree/parse.h

PARSER_SRC = \
  libinterp/parse-tree/lex.ll \
  libinterp/parse-tree/oct-parse.yy

PARSE_TREE_INC = \
  libinterp/parse-tree/pt-all.h \
  libinterp/parse-tree/pt-arg-list.h \
  libinterp/parse-tree/pt-array-list.h \
  libinterp/parse-tree/pt-assign.h \
  libinterp/parse-tree/pt-binop.h \
  libinterp/parse-tree/pt-bp.h \
  libinterp/parse-tree/pt-cbinop.h \
  libinterp/parse-tree/pt-cell.h \
  libinterp/parse-tree/pt-check.h \
  libinterp/parse-tree/pt-classdef.h \
  libinterp/parse-tree/pt-cmd.h \
  libinterp/parse-tree/pt-colon.h \
  libinterp/parse-tree/pt-const.h \
  libinterp/parse-tree/pt-decl.h \
  libinterp/parse-tree/pt-eval.h \
  libinterp/parse-tree/pt-except.h \
  libinterp/parse-tree/pt-exp.h \
  libinterp/parse-tree/pt-fcn-handle.h \
  libinterp/parse-tree/pt-funcall.h \
  libinterp/parse-tree/pt-id.h \
  libinterp/parse-tree/pt-idx.h \
  libinterp/parse-tree/pt-jump.h \
  libinterp/parse-tree/pt-loop.h \
  libinterp/parse-tree/pt-mat.h \
  libinterp/parse-tree/pt-misc.h \
  libinterp/parse-tree/pt-pr-code.h \
  libinterp/parse-tree/pt-select.h \
  libinterp/parse-tree/pt-stmt.h \
  libinterp/parse-tree/pt-unop.h \
  libinterp/parse-tree/pt-walk.h \
  libinterp/parse-tree/pt.h \
  libinterp/parse-tree/token.h

PARSE_TREE_SRC = \
  libinterp/parse-tree/pt-arg-list.cc \
  libinterp/parse-tree/pt-array-list.cc \
  libinterp/parse-tree/pt-assign.cc \
  libinterp/parse-tree/pt-binop.cc \
  libinterp/parse-tree/pt-bp.cc \
  libinterp/parse-tree/pt-cbinop.cc \
  libinterp/parse-tree/pt-cell.cc \
  libinterp/parse-tree/pt-check.cc \
  libinterp/parse-tree/pt-classdef.cc \
  libinterp/parse-tree/pt-cmd.cc \
  libinterp/parse-tree/pt-colon.cc \
  libinterp/parse-tree/pt-const.cc \
  libinterp/parse-tree/pt-decl.cc \
  libinterp/parse-tree/pt-eval.cc \
  libinterp/parse-tree/pt-except.cc \
  libinterp/parse-tree/pt-exp.cc \
  libinterp/parse-tree/pt-fcn-handle.cc \
  libinterp/parse-tree/pt-funcall.cc \
  libinterp/parse-tree/pt-id.cc \
  libinterp/parse-tree/pt-idx.cc \
  libinterp/parse-tree/pt-jump.cc \
  libinterp/parse-tree/pt-loop.cc \
  libinterp/parse-tree/pt-mat.cc \
  libinterp/parse-tree/pt-misc.cc \
  libinterp/parse-tree/pt-pr-code.cc \
  libinterp/parse-tree/pt-select.cc \
  libinterp/parse-tree/pt-stmt.cc \
  libinterp/parse-tree/pt-unop.cc \
  libinterp/parse-tree/pt.cc \
  libinterp/parse-tree/token.cc

## Special rules for sources which must be built before rest of compilation.

## Don't use a pipeline to process gperf output since if gperf
## is missing but sed is not, the exit status of the pipeline
## will still be success and we will end up creating an empty
## oct-gperf.h file.
libinterp/parse-tree/oct-gperf.h: libinterp/parse-tree/octave.gperf
	$(AM_V_GEN)rm -f $@-t $@t1 $@ && \
	$(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash $< > $@-t1 && \
	$(SED) 's,lookup\[,gperf_lookup[,' < $@-t1 > $@-t && \
	mv $@-t $@ && \
	rm -f $@-t1

libinterp/parse-tree/oct-parse.h: libinterp/parse-tree/oct-parse.cc

libinterp/parse-tree/oct-parse.yy: libinterp/parse-tree/oct-parse.in.yy
	$(AM_V_GEN)$(call subst-bison-api-decls,octave_)

noinst_LTLIBRARIES += \
  libinterp/parse-tree/libparse-tree.la \
  libinterp/parse-tree/libparser.la

libinterp_parse_tree_libparse_tree_la_SOURCES = $(PARSE_TREE_SRC)

libinterp_parse_tree_libparse_tree_la_CPPFLAGS = $(libinterp_liboctinterp_la_CPPFLAGS)

libinterp_parse_tree_libparse_tree_la_CFLAGS = $(AM_CFLAGS)	\
$(WARN_CFLAGS)

libinterp_parse_tree_libparse_tree_la_CXXFLAGS = $(AM_CXXFLAGS) $(WARN_CXXFLAGS)

libinterp_parse_tree_libparser_la_SOURCES = $(PARSER_SRC)

libinterp_parse_tree_libparser_la_CPPFLAGS = $(libinterp_liboctinterp_la_CPPFLAGS)

libinterp_parse_tree_libparser_la_CXXFLAGS = \
  $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))

libinterp_EXTRA_DIST += \
  libinterp/parse-tree/oct-parse.in.yy \
  libinterp/parse-tree/octave.gperf