Mercurial > octave-nkf

diff src/ov-re-mat.cc @ 7922:935be827eaf8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
error for NaN values in & and | expressions
author John W. Eaton <jwe@octave.org>
date Fri, 11 Jul 2008 14:56:30 -0400
parents f336dd8e96d0
children c777f3ce02d8
line wrap: on
line diff
--- a/src/ov-re-mat.cc	Thu Jul 10 17:36:20 2008 -0400
+++ b/src/ov-re-mat.cc	Fri Jul 11 14:56:30 2008 -0400
@@ -224,7 +224,9 @@
 boolNDArray
 octave_matrix::bool_array_value (bool warn) const
 {
-  if (warn && matrix.any_element_not_one_or_zero ())
+  if (matrix.any_element_is_nan ())
+    error ("invalid conversion from NaN to logical");
+  else if (warn && matrix.any_element_not_one_or_zero ())
     gripe_logical_conversion ();
 
   return boolNDArray (matrix);