view test/command.tst @ 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 af8a70d6885c
children
line wrap: on
line source

## Don't alter the spacing in the command_test lines.  These are
## specifically testing for possible differences in things like
##   A(X) or A( X ) or A (X) or A ( X )

%!function command_test (varargin)
%!  assignin ('caller', 'cmd_out', ['|', sprintf('%s|', varargin{:})]);
%!endfunction

%!function gobble_command (varargin)
%!endfunction

## 0, 1, 2, 3 simple arguments
%!test
%! command_test
%! assert (cmd_out, '|')
%!test
%! command_test a
%! assert (cmd_out, '|a|')
%!test
%! command_test aa     b
%! assert (cmd_out, '|aa|b|')
%!test
%! command_test aaa  bb    c
%! assert (cmd_out, '|aaa|bb|c|')

## continuation
%!test
%! command_test a...
%!  bb ccc
%! assert (cmd_out, '|a|bb|ccc|')
%!test
%! command_test a ...
%!  bb ccc
%! assert (cmd_out, '|a|bb|ccc|')
%!test
%! command_test aa(...
%!  bb cc
%! assert (cmd_out, '|aa(|bb|cc|')
%!test
%! command_test aa(   ...
%!  bb cc
%! assert (cmd_out, '|aa(   |bb|cc|')

## comments
%!test
%! command_test aa bb cc%comment
%! assert (cmd_out, '|aa|bb|cc|')
%!test
%! command_test aa bb cc#comment
%! assert (cmd_out, '|aa|bb|cc|')
%!test
%! command_test aa bb cc   %comment
%! assert (cmd_out, '|aa|bb|cc|')
%!test
%! command_test aa bb cc   #comment
%! assert (cmd_out, '|aa|bb|cc|')
%!test
%! command_test aa bb cc(  %comment
%! assert (cmd_out, '|aa|bb|cc(  |')
%!test
%! command_test aa bb cc(  #comment
%! assert (cmd_out, '|aa|bb|cc(  |')

## semicolons and commas; multiple commands
%!test
%! command_test aa bb, gobble_command cc
%! assert (cmd_out, '|aa|bb|')
%!test
%! command_test aa bb ; gobble_command cc
%! assert (cmd_out, '|aa|bb|')
%!test
%! command_test aa bb ; command_test cc dd
%! assert (cmd_out, '|cc|dd|')
%!test
%! command_test aa bb
%!test
%! command_test cc dd
%! assert (cmd_out, '|cc|dd|')

## parenthesis matching
%!test
%! command_test aa(bb,cc,dd) ee(ff,gg) hh
%! assert (cmd_out, '|aa(bb,cc,dd)|ee(ff,gg)|hh|')
%!test
%! command_test aa([bb,cc)]
%! assert (cmd_out, '|aa([bb,cc)]|')
%!test
%! command_test aa(,@!$@"bb"'cc'
%! assert (cmd_out, '|aa(,@!$@"bb"''cc''|')
%!test
%! command_test aa(bb,cc,dd)
%! assert (cmd_out, '|aa(bb,cc,dd)|')
%!test
%! command_test aa( bb,cc,dd )
%! assert (cmd_out, '|aa( bb,cc,dd )|')
%!test
%! command_test aa (bb,cc,dd)
%! assert (cmd_out, '|aa|(bb,cc,dd)|')
%!test
%! command_test aa ( bb,cc,dd )
%! assert (cmd_out, '|aa|( bb,cc,dd )|')
%!test
%! command_test aa(bb, cc, dd)
%! assert (cmd_out, '|aa(bb, cc, dd)|')
%!test
%! command_test aa( bb, cc, dd )
%! assert (cmd_out, '|aa( bb, cc, dd )|')
%!test
%! command_test aa (bb, cc, dd)
%! assert (cmd_out, '|aa|(bb, cc, dd)|')
%!test
%! command_test aa ( bb, cc, dd )
%! assert (cmd_out, '|aa|( bb, cc, dd )|')

## single and double quotes
%!test
%! command_test "aa" 'bb' cc
%! assert (cmd_out, '|aa|bb|cc|')
%!test
%! command_test "aa"'bb'cc
%! assert (cmd_out, '|aabbcc|')
%!test
%! command_test aa'bb'"cc"
%! assert (cmd_out, '|aabbcc|')
%!test
%! command_test "aa"bb'cc'
%! assert (cmd_out, '|aabbcc|')

## CVX-inspired
%!test
%! command_test Z(n,n) hermitian toeplitz
%! assert (cmd_out, '|Z(n,n)|hermitian|toeplitz|')
%!test
%! command_test X( n, n ) symmetric
%! assert (cmd_out, '|X( n, n )|symmetric|')
%!test
%! command_test xw( nm-1, nv );
%! assert (cmd_out, '|xw( nm-1, nv )|')
%!test
%! command_test x( sx ) y( sx ) z( sx )
%! assert (cmd_out, '|x( sx )|y( sx )|z( sx )|')
%!test
%! command_test coeffs(deg+1) complex;
%! assert (cmd_out, '|coeffs(deg+1)|complex|')
%!test
%! command_test w( 1, npairs * nv ) v( 1, npairs * nv )
%! assert (cmd_out, '|w( 1, npairs * nv )|v( 1, npairs * nv )|')
%!test
%! command_test w(m,1)   % edge weights
%! assert (cmd_out, '|w(m,1)|')
%!test
%! command_test x2( size( x ) )
%! assert (cmd_out, '|x2( size( x ) )|')