Mercurial > jwe > octave

changeset 788:5148e500c2fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1994-10-11 01:16:51 by jwe]
author jwe
date Tue, 11 Oct 1994 01:16:51 +0000
parents c5d35bb139b6
children 0bbb90a2932e
files src/pt-exp-base.cc
diffstat 1 files changed, 8 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/pt-exp-base.cc	Tue Oct 11 00:34:39 1994 +0000
+++ b/src/pt-exp-base.cc	Tue Oct 11 01:16:51 1994 +0000
@@ -2387,10 +2387,13 @@
 	  else
 	    error ("%s: unable to handle real arguments", m_fcn.name);
 	}
-      else if (arg.is_matrix_type ())
+      else
 	{
 	  Matrix m = arg.matrix_value ();
 
+	  if (error_state)
+	    return retval;
+
 	  if (m_fcn.can_return_complex_for_real_arg
 	      && (any_element_less_than (m, m_fcn.lower_limit)
 		  || any_element_greater_than (m, m_fcn.upper_limit)))
@@ -2405,8 +2408,6 @@
 	  else
 	    error ("%s: unable to handle real arguments", m_fcn.name);
 	}
-      else
-	gripe_wrong_type_arg ("mapper", arg);
     }
   else if (arg.is_complex_type ())
     {
@@ -2421,10 +2422,13 @@
 	  else
 	    error ("%s: unable to handle complex arguments", m_fcn.name);
 	}
-      else if (arg.is_matrix_type ())
+      else
 	{
 	  ComplexMatrix cm = arg.complex_matrix_value ();
 
+	  if (error_state)
+	    return retval;
+
 	  if (m_fcn.d_c_mapper)
 	    retval = map (m_fcn.d_c_mapper, cm);
 	  else if (m_fcn.c_c_mapper)
@@ -2432,8 +2436,6 @@
 	  else
 	    error ("%s: unable to handle complex arguments", m_fcn.name);
 	}
-      else
-	gripe_wrong_type_arg ("mapper", arg);
     }
   else
     gripe_wrong_type_arg ("mapper", arg);