Mercurial > hg > octave-nkf

comparison src/ov-range.cc @ 11129:0de5cc44e690

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use gripe functions for NaN to logical and NaN to character conversions more consistently
author John W. Eaton <jwe@octave.org>
date Thu, 21 Oct 2010 16:12:00 -0400
parents 89f4d7e294cc
children 2271261f088a
comparison
equal deleted inserted replaced
11128:9cb5c0b7b43b 11129:0de5cc44e690
315 octave_range::bool_array_value (bool warn) const 315 octave_range::bool_array_value (bool warn) const
316 { 316 {
317 Matrix m = range.matrix_value (); 317 Matrix m = range.matrix_value ();
318 318
319 if (m.any_element_is_nan ()) 319 if (m.any_element_is_nan ())
320 error ("invalid conversion from NaN to logical"); 320 gripe_nan_to_logical_conversion ();
321 else if (warn && m.any_element_not_one_or_zero ()) 321 else if (warn && m.any_element_not_one_or_zero ())
322 gripe_logical_conversion (); 322 gripe_logical_conversion ();
323 323
324 return boolNDArray (m); 324 return boolNDArray (m);
325 } 325 }