Mercurial > octave-nkf

comparison libinterp/octave-value/ov-str-mat.cc @ 20587:f90c8372b7ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate many more simple uses of error_state * Cell.cc, __ichol__.cc, __ilu__.cc, balance.cc, bsxfun.cc, colloc.cc, det.cc, dlmread.cc, dynamic-ld.cc, eig.cc, fft.cc, fft2.cc, fftn.cc, gcd.cc, getgrent.cc, getpwent.cc, givens.cc, hess.cc, input.cc, levenshtein.cc, load-path.cc, lookup.cc, ls-mat-ascii.cc, ls-mat4.cc, lsode.cc, lu.cc, max.cc, md5sum.cc, mex.cc, pager.cc, pinv.cc, pr-output.cc, qz.cc, schur.cc, sparse.cc, sqrtm.cc, str2double.cc, strfns.cc, sub2ind.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.cc, typecast.cc, __init_gnuplot__.cc, __magick_read__.cc, __osmesa_print__.cc, amd.cc, audiodevinfo.cc, dmperm.cc, fftw.cc, symrcm.cc, ov-base-diag.cc, ov-base-sparse.cc, ov-base.cc, ov-bool-sparse.cc, ov-builtin.cc, ov-complex.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-flt-complex.cc, ov-flt-cx-diag.cc, ov-flt-cx-mat.cc, ov-flt-re-diag.cc, ov-flt-re-mat.cc, ov-lazy-idx.cc, ov-mex-fcn.cc, ov-perm.cc, ov-range.cc, ov-re-diag.cc, ov-re-mat.cc, ov-re-sparse.cc, ov-scalar.cc, ov-str-mat.cc, op-bm-b.cc, op-bm-bm.cc, op-sbm-b.cc, op-sbm-bm.cc, op-str-m.cc, op-str-s.cc, oct-parse.in.yy, pt-cbinop.cc, pt-colon.cc, pt-decl.cc, pt-exp.cc, pt-id.cc, pt-misc.cc, pt-select.cc, pt-unop.cc: Eliminate simple uses of error_state.
author John W. Eaton <jwe@octave.org>
date Mon, 05 Oct 2015 19:29:36 -0400
parents dd6345fd8a97
children 40ed9b46a800
comparison
equal deleted inserted replaced
20586:b7ac1e94266e 20587:f90c8372b7ba
66 66
67 CAST_CONV_ARG (const octave_char_matrix_str&); 67 CAST_CONV_ARG (const octave_char_matrix_str&);
68 68
69 NDArray nda = v.array_value (true); 69 NDArray nda = v.array_value (true);
70 70
71 if (! error_state) 71 if (nda.numel () == 1)
72 { 72 retval = new octave_scalar (nda(0));
73 if (nda.numel () == 1) 73 else
74 retval = new octave_scalar (nda(0)); 74 retval = new octave_matrix (nda);
75 else
76 retval = new octave_matrix (nda);
77 }
78 75
79 return retval; 76 return retval;
80 } 77 }
81 78
82 octave_base_value::type_conv_info 79 octave_base_value::type_conv_info
110 107
111 case 1: 108 case 1:
112 { 109 {
113 idx_vector i = idx (0).index_vector (); 110 idx_vector i = idx (0).index_vector ();
114 111
115 if (! error_state) 112 retval = octave_value (charNDArray (matrix.index (i, resize_ok)),
116 retval = octave_value (charNDArray (matrix.index (i, resize_ok)), 113 type);
117 type);
118 } 114 }
119 break; 115 break;
120 116
121 case 2: 117 case 2:
122 { 118 {
123 idx_vector i = idx (0).index_vector (); 119 idx_vector i = idx (0).index_vector ();
124 k = 1; 120 k = 1;
125 idx_vector j = idx (1).index_vector (); 121 idx_vector j = idx (1).index_vector ();
126 122
127 if (! error_state) 123 retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)),
128 retval = octave_value (charNDArray (matrix.index (i, j, resize_ok)), 124 type);
129 type);
130 } 125 }
131 break; 126 break;
132 127
133 default: 128 default:
134 { 129 {
135 Array<idx_vector> idx_vec (dim_vector (len, 1)); 130 Array<idx_vector> idx_vec (dim_vector (len, 1));
136 131
137 for (k = 0; k < len; k++) 132 for (k = 0; k < len; k++)
138 idx_vec(k) = idx(k).index_vector (); 133 idx_vec(k) = idx(k).index_vector ();
139 134
140 if (! error_state) 135 retval =
141 retval = 136 octave_value (charNDArray (matrix.index (idx_vec, resize_ok)),
142 octave_value (charNDArray (matrix.index (idx_vec, resize_ok)), 137 type);
143 type);
144 } 138 }
145 break; 139 break;
146 } 140 }
147 } 141 }
148 catch (index_exception& e) 142 catch (index_exception& e)
441 i+1); 435 i+1);
442 success = false; 436 success = false;
443 } 437 }
444 } 438 }
445 439
446 if (! error_state) 440 matrix = chm;
447 matrix = chm;
448 } 441 }
449 else 442 else
450 { 443 {
451 error ("load: failed to extract number of string elements"); 444 error ("load: failed to extract number of string elements");
452 success = false; 445 success = false;
553 546
554 charNDArray m(dv); 547 charNDArray m(dv);
555 char *tmp = m.fortran_vec (); 548 char *tmp = m.fortran_vec ();
556 is.read (tmp, dv.numel ()); 549 is.read (tmp, dv.numel ());
557 550
558 if (error_state || ! is) 551 if (! is)
559 return false; 552 return false;
553
560 matrix = m; 554 matrix = m;
561 } 555 }
562 else 556 else
563 { 557 {
564 charMatrix chm (elements, 0); 558 charMatrix chm (elements, 0);