Mercurial > octave-nkf

comparison libinterp/corefcn/typecast.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 b2100e1659ac
children
comparison
equal deleted inserted replaced
20586:b7ac1e94266e 20587:f90c8372b7ba
210 error ("typecast: invalid input class: %s", 210 error ("typecast: invalid input class: %s",
211 array.class_name ().c_str ()); 211 array.class_name ().c_str ());
212 212
213 std::string numclass = args(1).string_value (); 213 std::string numclass = args(1).string_value ();
214 214
215 if (error_state || numclass.size () == 0) 215 if (numclass.size () == 0)
216 ; 216 ;
217 else if (numclass == "char") 217 else if (numclass == "char")
218 retval = octave_value (reinterpret_copy<charNDArray> 218 retval = octave_value (reinterpret_copy<charNDArray>
219 (data, byte_size, old_dims), array.is_dq_string () ? '"' 219 (data, byte_size, old_dims), array.is_dq_string () ? '"'
220 : '\''); 220 : '\'');
251 retval = reinterpret_copy<FloatComplexNDArray> (data, byte_size, 251 retval = reinterpret_copy<FloatComplexNDArray> (data, byte_size,
252 old_dims); 252 old_dims);
253 else if (numclass == "double complex") 253 else if (numclass == "double complex")
254 retval = reinterpret_copy<ComplexNDArray> (data, byte_size, old_dims); 254 retval = reinterpret_copy<ComplexNDArray> (data, byte_size, old_dims);
255 255
256 if (! error_state && retval.is_undefined ()) 256 if (retval.is_undefined ())
257 error ("typecast: cannot convert to %s class", numclass.c_str ()); 257 error ("typecast: cannot convert to %s class", numclass.c_str ());
258 } 258 }
259 else 259 else
260 print_usage (); 260 print_usage ();
261 261
345 { 345 {
346 boolNDArray bitp = args(0).bool_array_value (); 346 boolNDArray bitp = args(0).bool_array_value ();
347 347
348 std::string numclass = args(1).string_value (); 348 std::string numclass = args(1).string_value ();
349 349
350 if (error_state || numclass.size () == 0) 350 if (numclass.size () == 0)
351 ; 351 ;
352 else if (numclass == "char") 352 else if (numclass == "char")
353 retval = octave_value (do_bitpack<charNDArray> (bitp), '\''); 353 retval = octave_value (do_bitpack<charNDArray> (bitp), '\'');
354 else if (numclass[0] == 'i') 354 else if (numclass[0] == 'i')
355 { 355 {
380 else if (numclass == "single complex") 380 else if (numclass == "single complex")
381 retval = do_bitpack<FloatComplexNDArray> (bitp); 381 retval = do_bitpack<FloatComplexNDArray> (bitp);
382 else if (numclass == "double complex") 382 else if (numclass == "double complex")
383 retval = do_bitpack<ComplexNDArray> (bitp); 383 retval = do_bitpack<ComplexNDArray> (bitp);
384 384
385 if (! error_state && retval.is_undefined ()) 385 if (retval.is_undefined ())
386 error ("bitpack: cannot pack to %s class", numclass.c_str ()); 386 error ("bitpack: cannot pack to %s class", numclass.c_str ());
387 } 387 }
388 388
389 return retval; 389 return retval;
390 } 390 }