Mercurial > octave
comparison libinterp/octave-value/ov-struct.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 | 99d373870017 |
| children | dfcb9d74b253 |
comparison
equal
deleted
inserted
replaced
| 21099:52af4092f863 | 21100:e39e05d90788 |
|---|---|
| 27 #include <iostream> | 27 #include <iostream> |
| 28 | 28 |
| 29 #include "Cell.h" | 29 #include "Cell.h" |
| 30 #include "defun.h" | 30 #include "defun.h" |
| 31 #include "error.h" | 31 #include "error.h" |
| 32 #include "gripes.h" | 32 #include "errwarn.h" |
| 33 #include "mxarray.h" | 33 #include "mxarray.h" |
| 34 #include "oct-lvalue.h" | 34 #include "oct-lvalue.h" |
| 35 #include "oct-hdf5.h" | 35 #include "oct-hdf5.h" |
| 36 #include "ov-struct.h" | 36 #include "ov-struct.h" |
| 37 #include "unwind-prot.h" | 37 #include "unwind-prot.h" |
| 90 | 90 |
| 91 return retval; | 91 return retval; |
| 92 } | 92 } |
| 93 | 93 |
| 94 static void | 94 static void |
| 95 gripe_invalid_index_for_assignment (void) | 95 err_invalid_index_for_assignment (void) |
| 96 { | 96 { |
| 97 error ("invalid index for structure array assignment"); | 97 error ("invalid index for structure array assignment"); |
| 98 } | 98 } |
| 99 | 99 |
| 100 static void | 100 static void |
| 101 gripe_invalid_index_type (const std::string& nm, char t) | 101 err_invalid_index_type (const std::string& nm, char t) |
| 102 { | 102 { |
| 103 error ("%s cannot be indexed with %c", nm.c_str (), t); | 103 error ("%s cannot be indexed with %c", nm.c_str (), t); |
| 104 } | 104 } |
| 105 | 105 |
| 106 static void | 106 static void |
| 163 } | 163 } |
| 164 } | 164 } |
| 165 break; | 165 break; |
| 166 | 166 |
| 167 case '{': | 167 case '{': |
| 168 gripe_invalid_index_type (type_name (), type[0]); | 168 err_invalid_index_type (type_name (), type[0]); |
| 169 break; | 169 break; |
| 170 | 170 |
| 171 default: | 171 default: |
| 172 panic_impossible (); | 172 panic_impossible (); |
| 173 } | 173 } |
| 226 } | 226 } |
| 227 } | 227 } |
| 228 break; | 228 break; |
| 229 | 229 |
| 230 case '{': | 230 case '{': |
| 231 gripe_invalid_index_type (type_name (), type[0]); | 231 err_invalid_index_type (type_name (), type[0]); |
| 232 break; | 232 break; |
| 233 | 233 |
| 234 default: | 234 default: |
| 235 panic_impossible (); | 235 panic_impossible (); |
| 236 } | 236 } |
| 340 t_rhs =(orig_undefined | 340 t_rhs =(orig_undefined |
| 341 ? tmp.undef_subsasgn (next_type, next_idx, rhs) | 341 ? tmp.undef_subsasgn (next_type, next_idx, rhs) |
| 342 : tmp.subsasgn (next_type, next_idx, rhs)); | 342 : tmp.subsasgn (next_type, next_idx, rhs)); |
| 343 } | 343 } |
| 344 else | 344 else |
| 345 gripe_indexed_cs_list (); | 345 err_indexed_cs_list (); |
| 346 } | 346 } |
| 347 else | 347 else |
| 348 gripe_invalid_index_for_assignment (); | 348 err_invalid_index_for_assignment (); |
| 349 } | 349 } |
| 350 break; | 350 break; |
| 351 | 351 |
| 352 case '.': | 352 case '.': |
| 353 { | 353 { |
| 394 t_rhs = (orig_undefined | 394 t_rhs = (orig_undefined |
| 395 ? tmp.undef_subsasgn (next_type, next_idx, rhs) | 395 ? tmp.undef_subsasgn (next_type, next_idx, rhs) |
| 396 : tmp.subsasgn (next_type, next_idx, rhs)); | 396 : tmp.subsasgn (next_type, next_idx, rhs)); |
| 397 } | 397 } |
| 398 else | 398 else |
| 399 gripe_indexed_cs_list (); | 399 err_indexed_cs_list (); |
| 400 } | 400 } |
| 401 break; | 401 break; |
| 402 | 402 |
| 403 case '{': | 403 case '{': |
| 404 gripe_invalid_index_type (type_name (), type[0]); | 404 err_invalid_index_type (type_name (), type[0]); |
| 405 break; | 405 break; |
| 406 | 406 |
| 407 default: | 407 default: |
| 408 panic_impossible (); | 408 panic_impossible (); |
| 409 } | 409 } |
| 458 | 458 |
| 459 count++; | 459 count++; |
| 460 retval = octave_value (this); | 460 retval = octave_value (this); |
| 461 } | 461 } |
| 462 else | 462 else |
| 463 gripe_nonbraced_cs_list_assignment (); | 463 err_nonbraced_cs_list_assignment (); |
| 464 } | 464 } |
| 465 } | 465 } |
| 466 else | 466 else |
| 467 { | 467 { |
| 468 if (t_rhs.is_map () || t_rhs.is_object ()) | 468 if (t_rhs.is_map () || t_rhs.is_object ()) |
| 522 retval = octave_value (this); | 522 retval = octave_value (this); |
| 523 } | 523 } |
| 524 break; | 524 break; |
| 525 | 525 |
| 526 case '{': | 526 case '{': |
| 527 gripe_invalid_index_type (type_name (), type[0]); | 527 err_invalid_index_type (type_name (), type[0]); |
| 528 break; | 528 break; |
| 529 | 529 |
| 530 default: | 530 default: |
| 531 panic_impossible (); | 531 panic_impossible (); |
| 532 } | 532 } |