view run-octave.in @ 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 ac0f7acdc3fd
children b65888ec820e
line wrap: on
line source

#! /bin/sh
##
## run-octave -- run Octave in the build tree.
##
## Copyright (C) 2006-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/>.

: ${AWK=%AWK%}
: ${FIND=%FIND%}
: ${SED=%SED%}

# FIXME -- is there a better way to handle the possibility of spaces
# in these names?

top_srcdir='%abs_top_srcdir%'
builddir='%builddir%'

d1="$top_srcdir/scripts"
d2="$builddir/scripts"
d3="$builddir/libinterp"
d4="$top_srcdir/examples/data"

d1_list=`$FIND "$d1" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
d2_list=`$FIND "$d2" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
d3_list=`$FIND "$d3" -type d -a ! \( \( -name private -o -name '@*' \) -a -prune \) -exec echo '{}' ';' | $SED 's/$/:/'`
d4_list=`$FIND "$d4" -type d -exec echo '{}' ';' | $SED 's/$/:/'`

d1_path=`echo "$d1_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`
d2_path=`echo "$d2_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`
d3_path=`echo "$d3_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`
d4_path=`echo "$d4_list" | $AWK '{ t = (s $0); s = t; } END { sub (/:$/, "", s); print s; }'`

octave_executable="$builddir/src/octave"

LOADPATH="$d1_path:$d2_path:$d3_path:$d4_path"
IMAGEPATH="$top_srcdir/scripts/image"
DOCFILE="$builddir/doc/interpreter/doc-cache"
BUILT_IN_DOCSTRINGS_FILE="$builddir/libinterp/DOCSTRINGS"
TEXIMACROSFILE="$top_srcdir/doc/interpreter/macros.texi"
INFOFILE="$top_srcdir/doc/interpreter/octave.info"

## Checking for string equality below with prepended x's in order to
## handle problems with empty strings.
if [ $# -gt 0 ]; then
  if [ "x$1" = "x-g" ]; then
    driver="gdb --args"
    shift
  elif [ "x$1" = "x-gud" ]; then
    ## Frontends for gdb (e.g. Emacs's GUD mode) need --annotate=3
    driver="gdb --annotate=3 --args"
    shift
  elif [ "x$1" = "x-gud2" ]; then
    ## The latest version of gud needs -i=mi. There isn't a good way to check
    ## this at configure time, so we just add a gud2 flag
    driver="gdb -i=mi --args"
    shift
  elif [ "x$1" = "x-valgrind" ]; then
    driver="valgrind --tool=memcheck"
    shift
  elif [ "x$1" = "x-callgrind" ]; then
    driver="valgrind --tool=callgrind"
    shift
  elif [ "x$1" = "x-strace" ]; then
    driver="strace -o octave.trace"
    shift
  elif [ "x$1" = "x-cli" ]; then
    octave_executable="$builddir/src/octave-cli"
    shift
  fi
fi

## We set OCTAVE_ARCHLIBDIR so that the wrapper program can find the
## octave-gui program in the build tree.  That will fail if we ever
## need Octave to find other things in ARCHLIBDIR that are not built
## in the $builddir/src directory.

OCTAVE_ARCHLIBDIR="$builddir/src"; export OCTAVE_ARCHLIBDIR
OCTAVE_BINDIR="$builddir/src"; export OCTAVE_BINDIR
OCTAVE_DEFAULT_QT_SETTINGS="$builddir/libgui/default-qt-settings"; export OCTAVE_DEFAULT_QT_SETTINGS
OCTAVE_JAVA_DIR="$builddir/scripts/java"; export OCTAVE_JAVA_DIR
OCTAVE_LOCALE_DIR="$builddir/libgui/languages"; export OCTAVE_LOCALE_DIR
OCTAVE_SITE_INITFILE="$top_srcdir/scripts/startup/site-rcfile"; export OCTAVE_SITE_INITFILE
OCTAVE_VERSION_INITFILE="$top_srcdir/scripts/startup/version-rcfile"; export OCTAVE_VERSION_INITFILE

exec $builddir/libtool --mode=execute $driver \
  "$octave_executable" --no-init-path --path="$LOADPATH" \
  --image-path="$IMAGEPATH" --doc-cache-file="$DOCFILE" \
  --built-in-docstrings-file="$BUILT_IN_DOCSTRINGS_FILE" \
  --texi-macros-file="$TEXIMACROSFILE" --info-file="$INFOFILE" "$@"