Mercurial > octave-nkf
view test/null-assign.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 | 4197fc428c7d |
children |
line wrap: on
line source
## Copyright (C) 2008-2015 Jaroslav Hajek ## ## 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/>. %!test %! a = 1:3; a(:) = []; assert (size (a), [0, 0]) %!test %! a = 1:3; a(1:3) = []; assert (size (a), [1, 0]) %!test %! a = (1:3).'; a(1:3) = []; assert (size (a), [0, 1]) %!test %! a = ones (3); a(:,:) = []; assert (size (a), [0, 3]) %!test %! a = ones (3); a(1:3,:) = []; assert (size (a), [0, 3]) %!test %! a = ones (3); a(:,1:3) = []; assert (size (a), [3, 0]) %!test %! a = ones (3); fail ("a(1:2,1:2) = []", ".*"); %!test %! a = ones (3); fail ("a(1:3,1:3) = []", ".*"); ## null strings should delete. [,] and [;] should delete. %!test %! a = ones (3); a(1:2,:) = [,]; assert (size (a), [1,3]) %!test %! a = ones (3); a(1:2,:) = [;]; assert (size (a), [1,3]) %!test %! a = ones (3); a(1:2,:) = ''; assert (size (a), [1,3]) %!test %! a = ones (3); a(1:2,:) = ""; assert (size (a), [1,3]) ## null matrix stored anywhere should lose its special status %!test %! a = ones (3); b = []; fail ("a(:,1:3) = b", ".") %!test %! a = ones (3); b{1} = []; fail ("a(:,1:3) = b{1}", ".") %!test %! a = ones (3); b.x = []; fail ("a(:,1:3) = b.x", ".") ## filtering a null matrix through a function should not delete %!test %! a = ones (3); fail ("a(:,1:3) = double ([])") ## subsasgn should work the same way %!test %! a = ones (3); a = subsasgn (a, substruct ('()', {':',1:2}), []); assert (size (a), [3,1]) %!test %! a = ones (3); b = []; fail ("subsasgn (a, substruct ('()', {':',1:2}), b)", ".") %!test %! classes = {@int8, @int16, @int32, @int64, ... %! @uint8, @uint16, @uint32, @uint64, ... %! @single, @double, @logical}; %! for i = 1:numel (classes) %! cls = classes{i}; %! x = cls ([1, 2, 3]); %! cls_nm = class (x); %! x(2) = []; %! assert (x, cls ([1, 3])); %! assert (class (x), cls_nm); %! x(2) = []; %! assert (x, cls (1)); %! assert (class (x), cls_nm); %! x(1) = []; %! assert (x, cls (zeros (1, 0))); %! assert (class (x), cls_nm); %! endfor %! for i = 1:numel (classes) %! cls = classes{i}; %! x = cls ([1, 2, 3]); %! cls_nm = class (x); %! x(2) = ''; %! assert (x, cls ([1, 3])); %! assert (class (x), cls_nm); %! x(2) = ''; %! assert (x, cls (1)); %! assert (class (x), cls_nm); %! x(1) = ''; %! assert (x, cls (zeros (1, 0))); %! assert (class (x), cls_nm); %! endfor %! for i = 1:numel (classes) %! cls = classes{i}; %! x = cls ([1, 2, 3]); %! cls_nm = class (x); %! x(2) = ""; %! assert (x, cls ([1, 3])); %! assert (class (x), cls_nm); %! x(2) = ""; %! assert (x, cls (1)); %! assert (class (x), cls_nm); %! x(1) = ""; %! assert (x, cls (zeros (1, 0))); %! assert (class (x), cls_nm); %! endfor