Mercurial > octave
comparison libinterp/corefcn/sub2ind.cc @ 21055:5e00ed38a58b
maint: Replace if/error/else paradigm with just if/error.
* __ilu__.cc, data.cc, file-io.cc, graphics.cc, graphics.in.h, ls-mat5.cc,
lu.cc, octave-link.cc, regexp.cc, schur.cc, spparms.cc, sub2ind.cc,
syscalls.cc, toplev.cc, variables.cc, xpow.cc, audiodevinfo.cc, ccolamd.cc,
ov-builtin.cc, ov-classdef.cc, ov-intx.h, ov-lazy-idx.cc, ov-mex-fcn.cc,
op-int.h, lex.ll, oct-parse.in.yy, pt-binop.cc, pt-cbinop.cc, pt-const.cc,
pt-decl.h, pt-fcn-handle.cc, pt-unop.cc, CollocWt.cc:
Replace if/error/else paradigm with just if/error.
| author | Rik <rik@octave.org> |
|---|---|
| date | Wed, 13 Jan 2016 11:02:22 -0800 |
| parents | 850e3d2533d4 |
| children | e39e05d90788 |
comparison
equal
deleted
inserted
replaced
| 21054:221847e5f488 | 21055:5e00ed38a58b |
|---|---|
| 41 dim_vector dv; | 41 dim_vector dv; |
| 42 octave_idx_type n = dimsv.numel (); | 42 octave_idx_type n = dimsv.numel (); |
| 43 | 43 |
| 44 if (n < 1) | 44 if (n < 1) |
| 45 error ("%s: dimension vector DIMS must not be empty", name); | 45 error ("%s: dimension vector DIMS must not be empty", name); |
| 46 else | 46 |
| 47 { | 47 dv.resize (std::max (n, static_cast<octave_idx_type> (2))); |
| 48 dv.resize (std::max (n, static_cast<octave_idx_type> (2))); | 48 dv(1) = 1; |
| 49 dv(1) = 1; | 49 for (octave_idx_type i = 0; i < n; i++) |
| 50 for (octave_idx_type i = 0; i < n; i++) | 50 { |
| 51 { | 51 octave_idx_type ii = dimsv(i); |
| 52 octave_idx_type ii = dimsv(i); | 52 if (ii == dimsv(i) && ii >= 0) |
| 53 if (ii == dimsv(i) && ii >= 0) | 53 dv(i) = ii; |
| 54 dv(i) = ii; | 54 else |
| 55 else | 55 error ("%s: dimension vector DIMS must contain integers", name); |
| 56 error ("%s: dimension vector DIMS must contain integers", name); | |
| 57 } | |
| 58 } | 56 } |
| 59 | 57 |
| 60 return dv; | 58 return dv; |
| 61 } | 59 } |
| 62 | 60 |