Mercurial > hg > octave-lyh

diff src/parse.y @ 8033:2ad5ba320b93

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
parse.y (Feval): Return value produced by evaluating CATCH string
author John W. Eaton <jwe@octave.org>
date Tue, 19 Aug 2008 13:47:03 -0400
parents 85184151822e
children 4f1ebb704545
line wrap: on
line diff
--- a/src/parse.y
+++ b/src/parse.y
@@ -3852,9 +3852,6 @@
       octave_value_list tmp = eval_string (args(0), nargout > 0,
 					   parse_status, nargout);
 
-      if (nargout > 0)
-	retval = tmp;
-
       if (nargin > 1 && (parse_status != 0 || error_state))
 	{
 	  error_state = 0;
@@ -3864,10 +3861,13 @@
 
 	  buffer_error_messages--;
 
-	  eval_string (args(1), 0, parse_status, nargout);
-
-	  retval = octave_value_list ();
+	  tmp = eval_string (args(1), nargout > 0, parse_status, nargout);
+
+	  if (nargout > 0)
+	    retval = tmp;
 	}
+      else if (nargout > 0)
+	retval = tmp;
 
       unwind_protect::run_frame ("Feval");
     }