Mercurial > octave

annotate liboctave/util/lo-array-gripes.cc @ 21135:95da3bc8a281

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
supress deprecated function warnings in Octave code * lo-array-gripes.cc, gripes.cc: Use GCC pragmas to suppress deprecated function warnings.
author John W. Eaton <jwe@octave.org>
date Fri, 22 Jan 2016 13:45:21 -0500
parents 7bb96a8df912
children e06e600f396a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11135
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 /*
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2
19697
4197fc428c7d maint: Update copyright notices for 2015.
John W. Eaton <jwe@octave.org>
parents: 19408
diff changeset
3 Copyright (C) 2003-2015 John W. Eaton
11135
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 Copyright (C) 2009 VZLU Prague
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 This file is part of Octave.
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 Octave is free software; you can redistribute it and/or modify it
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 under the terms of the GNU General Public License as published by the
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 Free Software Foundation; either version 3 of the License, or (at your
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 option) any later version.
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 Octave is distributed in the hope that it will be useful, but WITHOUT
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 for more details.
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 You should have received a copy of the GNU General Public License
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 along with Octave; see the file COPYING. If not, see
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 <http://www.gnu.org/licenses/>.
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22 */
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23
21101
2e8aea678f2a Deprecate gripe_XXX functions.
Rik <rik@octave.org>
parents: 21100
diff changeset
24 // FIXME: All gripe_XXX functions deprecated in 4.2. Remove file in 4.6
2e8aea678f2a Deprecate gripe_XXX functions.
Rik <rik@octave.org>
parents: 21100
diff changeset
25
11135
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
26 #ifdef HAVE_CONFIG_H
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
27 #include <config.h>
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 #endif
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
30 #include <sstream>
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
31
11135
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
32 #include "lo-array-gripes.h"
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 #include "lo-error.h"
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
34
21111
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
35 // Text constants used to shorten code below.
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
36 static const char *error_id_nonconformant_args = "Octave:nonconformant-args";
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
37
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
38 static const char *error_id_index_out_of_bounds = "Octave:index-out-of-bounds";
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
39
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
40 static const char *error_id_invalid_index = "Octave:invalid-index";
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
41
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
42 static const char *warning_id_nearly_singular_matrix = "Octave:nearly-singular-matrix";
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
43
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
44 static const char *warning_id_singular_matrix = "Octave:singular-matrix";
7bb96a8df912 lo-array-errwarn.h: Don't export string constants unnecessarily.
Rik <rik@octave.org>
parents: 21101
diff changeset
45
11135
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
46 void
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
47 gripe_nan_to_logical_conversion (void)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
48 {
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 (*current_liboctave_error_handler)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 ("invalid conversion from NaN to logical");
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
51 }
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
52
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 void
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
54 gripe_nan_to_character_conversion (void)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
55 {
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
56 (*current_liboctave_error_handler)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
57 ("invalid conversion from NaN to character");
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
58 }
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
60 void
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 gripe_nonconformant (const char *op, octave_idx_type op1_len,
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
62 octave_idx_type op2_len)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
63 {
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
64 const char *err_id = error_id_nonconformant_args;
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
65
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66 (*current_liboctave_error_with_id_handler)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
67 (err_id, "%s: nonconformant arguments (op1 len: %d, op2 len: %d)",
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 op, op1_len, op2_len);
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
69 }
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
70
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 void
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 gripe_nonconformant (const char *op,
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
73 octave_idx_type op1_nr, octave_idx_type op1_nc,
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
74 octave_idx_type op2_nr, octave_idx_type op2_nc)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75 {
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
76 const char *err_id = error_id_nonconformant_args;
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
77
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
78 (*current_liboctave_error_with_id_handler)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79 (err_id, "%s: nonconformant arguments (op1 is %dx%d, op2 is %dx%d)",
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
80 op, op1_nr, op1_nc, op2_nr, op2_nc);
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
81 }
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
82
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
83 void
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
84 gripe_nonconformant (const char *op, const dim_vector& op1_dims,
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
85 const dim_vector& op2_dims)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
86 {
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
87 const char *err_id = error_id_nonconformant_args;
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
88
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
89 std::string op1_dims_str = op1_dims.str ();
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
90 std::string op2_dims_str = op2_dims.str ();
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
91
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
92 (*current_liboctave_error_with_id_handler)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
93 (err_id, "%s: nonconformant arguments (op1 is %s, op2 is %s)",
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
94 op, op1_dims_str.c_str (), op2_dims_str.c_str ());
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
95 }
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
96
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
97 void
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
98 gripe_del_index_out_of_range (bool is1d, octave_idx_type idx,
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
99 octave_idx_type ext)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
100 {
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
101 const char *err_id = error_id_index_out_of_bounds;
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
102
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
103 (*current_liboctave_error_with_id_handler)
20795
ba2367658dc8 Use ':' rather than ';' in error messages from bad indexing (bug #46536).
Rik <rik@octave.org>
parents: 20653
diff changeset
104 (err_id, "A(%s) = []: index out of bounds: value %d out of bound %d",
11135
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
105 is1d ? "I" : "..,I,..", idx, ext);
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
106 }
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
107
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
108 class invalid_index : public index_exception
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
109 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
110 public:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
111
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
112 invalid_index (const std::string& value, octave_idx_type ndim,
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
113 octave_idx_type dimen)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
114 : index_exception (value, ndim, dimen)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
115 { }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
116
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
117 std::string details (void) const
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
118 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
119 #ifdef USE_64_BIT_IDX_T
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
120 return "subscripts must be either integers 1 to (2^63)-1 or logicals";
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
121 #else
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
122 return "subscripts must be either integers 1 to (2^31)-1 or logicals";
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
123 #endif
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
124 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
125
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
126 // ID of error to throw
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
127 const char *err_id (void) const
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
128 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
129 return error_id_invalid_index;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
130 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
131 };
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
132
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
133 // Complain if an index is negative, fractional, or too big.
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
134
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
135 void
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
136 gripe_invalid_index (const std::string& idx, octave_idx_type nd,
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
137 octave_idx_type dim, const std::string&)
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
138 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
139 invalid_index e (idx, nd, dim);
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
140
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
141 throw e;
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
142 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
143
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
144 void
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
145 gripe_invalid_index (octave_idx_type n, octave_idx_type nd,
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
146 octave_idx_type dim, const std::string& var)
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
147 {
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
148 std::ostringstream buf;
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
149 buf << n + 1;
21135
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
150
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
151 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
152 #pragma GCC diagnostic push
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
153 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
154 #endif
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
155
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
156 gripe_invalid_index (buf.str (), nd, dim, var);
21135
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
157
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
158 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
159 #pragma GCC diagnostic pop
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
160 #endif
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
161 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
162
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
163 void
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
164 gripe_invalid_index (double n, octave_idx_type nd, octave_idx_type dim,
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
165 const std::string& var)
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
166 {
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
167 std::ostringstream buf;
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
168 buf << n + 1;
21135
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
169
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
170 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
171 #pragma GCC diagnostic push
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
172 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
173 #endif
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
174
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
175 gripe_invalid_index (buf.str (), nd, dim, var);
21135
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
176
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
177 #if defined (HAVE_PRAGMA_GCC_DIAGNOSTIC)
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
178 #pragma GCC diagnostic pop
95da3bc8a281 supress deprecated function warnings in Octave code
John W. Eaton <jwe@octave.org>
parents: 21111
diff changeset
179 #endif
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
180 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
181
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
182
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
183 // Gripe and exception for read access beyond the bounds of an array.
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
184
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
185 class out_of_range : public index_exception
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
186 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
187 public:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
188
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
189 out_of_range (const std::string& value, octave_idx_type nd_in,
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
190 octave_idx_type dim_in)
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
191 : index_exception (value, nd_in, dim_in), extent (0)
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
192 { }
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
193
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
194 std::string details (void) const
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
195 {
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
196 std::string expl;
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
197
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
198 if (nd >= size.length ()) // if not an index slice
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
199 {
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
200 if (var != "")
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
201 expl = "but " + var + " has size ";
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
202 else
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
203 expl = "but object has size ";
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
204
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
205 expl = expl + size.str ('x');
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
206 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
207 else
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
208 {
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
209 std::ostringstream buf;
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
210 buf << extent;
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
211 expl = "out of bound " + buf.str ();
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
212 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
213
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
214 return expl;
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
215 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
216
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
217 // ID of error to throw.
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
218 const char *err_id (void) const
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
219 {
20652
7a8096f8df5d more cleanup of indexing exceptions
John W. Eaton <jwe@octave.org>
parents: 20651
diff changeset
220 return error_id_index_out_of_bounds;
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
221 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
222
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
223 void set_size (const dim_vector& size_in) { size = size_in; }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
224
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
225 void set_extent (octave_idx_type ext) { extent = ext; }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
226
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
227 private:
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
228
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
229 // Dimension of object being accessed.
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
230 dim_vector size;
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
231
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
232 // Length of dimension being accessed.
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
233 octave_idx_type extent;
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
234 };
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
235
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
236 // Complain of an index that is out of range, but we don't know matrix size
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
237 void
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
238 gripe_index_out_of_range (int nd, int dim, octave_idx_type idx,
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
239 octave_idx_type ext)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
240 {
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
241 std::ostringstream buf;
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
242 buf << idx;
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
243 out_of_range e (buf.str (), nd, dim);
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
244
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
245 e.set_extent (ext);
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
246 // ??? Make details method give extent not size.
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
247 e.set_size (dim_vector (1, 1, 1, 1, 1, 1,1));
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
248
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
249 throw e;
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
250 }
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
251
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
252 // Complain of an index that is out of range
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
253 void
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
254 gripe_index_out_of_range (int nd, int dim, octave_idx_type idx,
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
255 octave_idx_type ext, const dim_vector& d)
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
256 {
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
257 std::ostringstream buf;
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
258 buf << idx;
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
259 out_of_range e (buf.str (), nd, dim);
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
260
20653
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
261 e.set_extent (ext);
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
262 e.set_size (d);
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
263
c16947991354 avoid fixed-size buffers in index exception code
John W. Eaton <jwe@octave.org>
parents: 20652
diff changeset
264 throw e;
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
265 }
11135
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
266
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
267 void
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
268 gripe_invalid_resize (void)
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
269 {
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
270 (*current_liboctave_error_with_id_handler)
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
271 ("Octave:invalid-resize",
11590
4ced6b90fffb style fixes for warning and error messages in source files
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
272 "Invalid resizing operation or ambiguous assignment to an out-of-bounds array element");
11135
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
273 }
047b0e877a14 add files for previous change
John W. Eaton <jwe@octave.org>
parents:
diff changeset
274
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
275 void
19408
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
276 gripe_singular_matrix (double rcond)
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
277 {
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
278 if (rcond == 0.0)
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
279 {
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
280 (*current_liboctave_warning_with_id_handler)
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
281 (warning_id_singular_matrix,
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
282 "matrix singular to machine precision");
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
283 }
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
284 else
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
285 {
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
286 (*current_liboctave_warning_with_id_handler)
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
287 (warning_id_nearly_singular_matrix,
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
288 "matrix singular to machine precision, rcond = %g", rcond);
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
289 }
a0c7001cf1a8 consistent messages and IDs for singular matrix warnings
John W. Eaton <jwe@octave.org>
parents: 17769
diff changeset
290 }
20542
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
291
dd6345fd8a97 use exceptions for better invalid index error reporting (bug #45957)
Lachlan Andrew <lachlanbis@gmail.com>
parents: 19697
diff changeset
292 /* Tests in test/index.tst */