Mercurial > octave
comparison liboctave/array/Array-util.cc @ 21100:e39e05d90788
Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
* libinterp/corefcn/errwarn.h, libinterp/corefcn/errwarn.cc: New header and .cc
file with common errors and warnings for libinterp.
* libinterp/corefcn/module.mk: Add errwarn.h, errwarn.cc to build system.
* liboctave/util/lo-array-errwarn.h, liboctave/util/lo-array-errwarn.cc: New
header and .cc file with common errors and warnings for liboctave.
* liboctave/util/module.mk: Add lo-array-errwarn.h, lo-array-errwarn.cc to
build system.
* lo-array-gripes.h: #include "lo-array-errwarn.h" for access to class
index_exception. Remove const char *error_id_XXX prototypes.
* lo-array-gripes.cc: Remove const char *error_id_XXX initializations.
Remove index_exception method definitions.
* Cell.cc, __pchip_deriv__.cc, __qp__.cc, balance.cc, betainc.cc, cellfun.cc,
daspk.cc, dasrt.cc, dassl.cc, data.cc, debug.cc, defaults.cc, det.cc,
dirfns.cc, eig.cc, fft.cc, fft2.cc, fftn.cc, find.cc, gammainc.cc, gcd.cc,
getgrent.cc, getpwent.cc, graphics.in.h, help.cc, hess.cc, hex2num.cc,
input.cc, inv.cc, jit-typeinfo.cc, load-save.cc, lookup.cc, ls-hdf5.cc,
ls-mat-ascii.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-binary.cc, ls-oct-text.cc,
lsode.cc, lu.cc, luinc.cc, max.cc, mgorth.cc, oct-hist.cc, oct-procbuf.cc,
oct-stream.cc, oct.h, pager.cc, pinv.cc, pr-output.cc, quad.cc, qz.cc, rand.cc,
rcond.cc, regexp.cc, schur.cc, sparse-xdiv.cc, sparse-xpow.cc, sparse.cc,
spparms.cc, sqrtm.cc, str2double.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
sylvester.cc, syscalls.cc, typecast.cc, utils.cc, variables.cc, xdiv.cc,
xnorm.cc, xpow.cc, __eigs__.cc, __glpk__.cc, __magick_read__.cc,
__osmesa_print__.cc, audiodevinfo.cc, audioread.cc, chol.cc, dmperm.cc,
fftw.cc, qr.cc, symbfact.cc, symrcm.cc, ov-base-diag.cc, ov-base-int.cc,
ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc, ov-base.cc,
ov-bool-mat.cc, ov-bool-sparse.cc, ov-bool.cc, ov-builtin.cc, ov-cell.cc,
ov-ch-mat.cc, ov-class.cc, ov-complex.cc, ov-complex.h, ov-cs-list.cc,
ov-cx-diag.cc, ov-cx-mat.cc, ov-cx-sparse.cc, ov-fcn-handle.cc,
ov-fcn-inline.cc, ov-float.cc, ov-float.h, ov-flt-complex.cc, ov-flt-complex.h,
ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-mat.cc, ov-int16.cc,
ov-int32.cc, ov-int64.cc, ov-int8.cc, ov-intx.h, ov-mex-fcn.cc, ov-perm.cc,
ov-range.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-scalar.h,
ov-str-mat.cc, ov-struct.cc, ov-type-conv.h, ov-uint16.cc, ov-uint32.cc,
ov-uint64.cc, ov-uint8.cc, ov-usr-fcn.cc, ov.cc, op-b-b.cc, op-b-bm.cc,
op-b-sbm.cc, op-bm-b.cc, op-bm-bm.cc, op-bm-sbm.cc, op-cdm-cdm.cc, op-cell.cc,
op-chm.cc, op-class.cc, op-cm-cm.cc, op-cm-cs.cc, op-cm-m.cc, op-cm-s.cc,
op-cm-scm.cc, op-cm-sm.cc, op-cs-cm.cc, op-cs-cs.cc, op-cs-m.cc, op-cs-s.cc,
op-cs-scm.cc, op-cs-sm.cc, op-dm-dm.cc, op-dm-scm.cc, op-dm-sm.cc,
op-dms-template.cc, op-double-conv.cc, op-fcdm-fcdm.cc, op-fcdm-fdm.cc,
op-fcm-fcm.cc, op-fcm-fcs.cc, op-fcm-fm.cc, op-fcm-fs.cc, op-fcn.cc,
op-fcs-fcm.cc, op-fcs-fcs.cc, op-fcs-fm.cc, op-fcs-fs.cc, op-fdm-fdm.cc,
op-float-conv.cc, op-fm-fcm.cc, op-fm-fcs.cc, op-fm-fm.cc, op-fm-fs.cc,
op-fs-fcm.cc, op-fs-fcs.cc, op-fs-fm.cc, op-fs-fs.cc, op-i16-i16.cc,
op-i32-i32.cc, op-i64-i64.cc, op-i8-i8.cc, op-int-concat.cc, op-int-conv.cc,
op-int.h, op-m-cm.cc, op-m-cs.cc, op-m-m.cc, op-m-s.cc, op-m-scm.cc,
op-m-sm.cc, op-pm-pm.cc, op-pm-scm.cc, op-pm-sm.cc, op-range.cc, op-s-cm.cc,
op-s-cs.cc, op-s-m.cc, op-s-s.cc, op-s-scm.cc, op-s-sm.cc, op-sbm-b.cc,
op-sbm-bm.cc, op-sbm-sbm.cc, op-scm-cm.cc, op-scm-cs.cc, op-scm-m.cc,
op-scm-s.cc, op-scm-scm.cc, op-scm-sm.cc, op-sm-cm.cc, op-sm-cs.cc, op-sm-m.cc,
op-sm-s.cc, op-sm-scm.cc, op-sm-sm.cc, op-str-m.cc, op-str-s.cc, op-str-str.cc,
op-struct.cc, op-ui16-ui16.cc, op-ui32-ui32.cc, op-ui64-ui64.cc, op-ui8-ui8.cc,
ops.h, lex.ll, pt-assign.cc, pt-eval.cc, pt-idx.cc, pt-loop.cc, pt-mat.cc,
pt-stmt.cc, Array-util.cc, Array-util.h, Array.cc, CColVector.cc,
CDiagMatrix.cc, CMatrix.cc, CNDArray.cc, CRowVector.cc, CSparse.cc,
DiagArray2.cc, MDiagArray2.cc, MSparse.cc, PermMatrix.cc, Range.cc, Sparse.cc,
dColVector.cc, dDiagMatrix.cc, dMatrix.cc, dNDArray.cc, dRowVector.cc,
dSparse.cc, fCColVector.cc, fCDiagMatrix.cc, fCMatrix.cc, fCNDArray.cc,
fCRowVector.cc, fColVector.cc, fDiagMatrix.cc, fMatrix.cc, fNDArray.cc,
fRowVector.cc, idx-vector.cc, CmplxGEPBAL.cc, dbleGEPBAL.cc, fCmplxGEPBAL.cc,
floatGEPBAL.cc, Sparse-diag-op-defs.h, Sparse-op-defs.h, Sparse-perm-op-defs.h,
mx-inlines.cc, mx-op-defs.h, oct-binmap.h:
Replace 'include "gripes.h"' with 'include "errwarn.h". Change all gripe_XXX
to err_XXX or warn_XXX or errwarn_XXX.
| author | Rik <rik@octave.org> |
|---|---|
| date | Mon, 18 Jan 2016 18:28:06 -0800 |
| parents | 8a65589d1a42 |
| children | 3ac9f47fb04b |
comparison
equal
deleted
inserted
replaced
| 21099:52af4092f863 | 21100:e39e05d90788 |
|---|---|
| 176 | 176 |
| 177 octave_idx_type | 177 octave_idx_type |
| 178 compute_index (octave_idx_type n, const dim_vector& dims) | 178 compute_index (octave_idx_type n, const dim_vector& dims) |
| 179 { | 179 { |
| 180 if (n < 0) | 180 if (n < 0) |
| 181 gripe_invalid_index (n, 1, 1); | 181 err_invalid_index (n, 1, 1); |
| 182 if (n >= dims.numel ()) | 182 if (n >= dims.numel ()) |
| 183 gripe_index_out_of_range (1, 1, n+1, dims.numel (), dims); | 183 err_index_out_of_range (1, 1, n+1, dims.numel (), dims); |
| 184 | 184 |
| 185 return n; | 185 return n; |
| 186 } | 186 } |
| 187 | 187 |
| 188 octave_idx_type | 188 octave_idx_type |
| 189 compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims) | 189 compute_index (octave_idx_type i, octave_idx_type j, const dim_vector& dims) |
| 190 { | 190 { |
| 191 if (i < 0) | 191 if (i < 0) |
| 192 gripe_invalid_index (i, 2, 1); | 192 err_invalid_index (i, 2, 1); |
| 193 else if (j < 0) | 193 else if (j < 0) |
| 194 gripe_invalid_index (j, 2, 2); | 194 err_invalid_index (j, 2, 2); |
| 195 if (i >= dims(0)) | 195 if (i >= dims(0)) |
| 196 gripe_index_out_of_range (2, 1, i+1, dims(0), dims); | 196 err_index_out_of_range (2, 1, i+1, dims(0), dims); |
| 197 if (j >= dims.numel (1)) | 197 if (j >= dims.numel (1)) |
| 198 gripe_index_out_of_range (2, 2, j+1, dims.numel (1), dims); | 198 err_index_out_of_range (2, 2, j+1, dims.numel (1), dims); |
| 199 | 199 |
| 200 return j*dims(0) + i; | 200 return j*dims(0) + i; |
| 201 } | 201 } |
| 202 | 202 |
| 203 octave_idx_type | 203 octave_idx_type |
| 204 compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k, | 204 compute_index (octave_idx_type i, octave_idx_type j, octave_idx_type k, |
| 205 const dim_vector& dims) | 205 const dim_vector& dims) |
| 206 { | 206 { |
| 207 if (i < 0) | 207 if (i < 0) |
| 208 gripe_invalid_index (i, 3, 1); | 208 err_invalid_index (i, 3, 1); |
| 209 else if (j < 0) | 209 else if (j < 0) |
| 210 gripe_invalid_index (j, 3, 2); | 210 err_invalid_index (j, 3, 2); |
| 211 else if (k < 0) | 211 else if (k < 0) |
| 212 gripe_invalid_index (k, 3, 3); | 212 err_invalid_index (k, 3, 3); |
| 213 if (i >= dims(0)) | 213 if (i >= dims(0)) |
| 214 gripe_index_out_of_range (3, 1, i+1, dims(0), dims); | 214 err_index_out_of_range (3, 1, i+1, dims(0), dims); |
| 215 if (j >= dims(1)) | 215 if (j >= dims(1)) |
| 216 gripe_index_out_of_range (3, 2, j+1, dims(1), dims); | 216 err_index_out_of_range (3, 2, j+1, dims(1), dims); |
| 217 if (k >= dims.numel (2)) | 217 if (k >= dims.numel (2)) |
| 218 gripe_index_out_of_range (3, 3, k+1, dims.numel (2), dims); | 218 err_index_out_of_range (3, 3, k+1, dims.numel (2), dims); |
| 219 | 219 |
| 220 return (k*dims(1) + j)*dims(0) + i; | 220 return (k*dims(1) + j)*dims(0) + i; |
| 221 } | 221 } |
| 222 | 222 |
| 223 octave_idx_type | 223 octave_idx_type |
| 226 int nd = ra_idx.numel (); | 226 int nd = ra_idx.numel (); |
| 227 const dim_vector dv = dims.redim (nd); | 227 const dim_vector dv = dims.redim (nd); |
| 228 for (int d = 0; d < nd; d++) | 228 for (int d = 0; d < nd; d++) |
| 229 { | 229 { |
| 230 if (ra_idx(d) < 0) | 230 if (ra_idx(d) < 0) |
| 231 gripe_invalid_index (ra_idx(d), nd, d+1); | 231 err_invalid_index (ra_idx(d), nd, d+1); |
| 232 if (ra_idx(d) >= dv(d)) | 232 if (ra_idx(d) >= dv(d)) |
| 233 gripe_index_out_of_range (nd, d+1, ra_idx(d)+1, dv(d), dims); | 233 err_index_out_of_range (nd, d+1, ra_idx(d)+1, dv(d), dims); |
| 234 } | 234 } |
| 235 | 235 |
| 236 return dv.compute_index (ra_idx.data ()); | 236 return dv.compute_index (ra_idx.data ()); |
| 237 } | 237 } |
| 238 | 238 |
| 557 else if (clen != idx.length (n)) | 557 else if (clen != idx.length (n)) |
| 558 (*current_liboctave_error_handler) | 558 (*current_liboctave_error_handler) |
| 559 ("sub2ind: lengths of indices must match"); | 559 ("sub2ind: lengths of indices must match"); |
| 560 | 560 |
| 561 if (idx.extent (n) > n) | 561 if (idx.extent (n) > n) |
| 562 gripe_index_out_of_range (len, i+1, idx.extent (n), n); | 562 err_index_out_of_range (len, i+1, idx.extent (n), n); |
| 563 } | 563 } |
| 564 catch (index_exception& e) | 564 catch (index_exception& e) |
| 565 { | 565 { |
| 566 e.set_pos_if_unset (len, i+1); | 566 e.set_pos_if_unset (len, i+1); |
| 567 e.set_var (); | 567 e.set_var (); |