parse.y (Fevalin): also return output from CATCH expression
author |
John W. Eaton <jwe@octave.org> |
date |
Sun, 09 Aug 2009 06:39:19 -0400 |
parents |
a321a1c227c8 |
children |
b096d11237be |
files |
src/ChangeLog src/parse.y |
diffstat |
2 files changed, 8 insertions(+), 3 deletions(-)
[+]
|
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2009-08-09 John W. Eaton <jwe@octave.org>
+
+ * parse.y (Fevalin): Also return output from CATCH expression.
+
2009-08-08 Jaroslav Hajek <highegg@gmail.com>
* data.cc (Fifelse): Rename to Fmerge, alias to Fifelse.
--- a/src/parse.y
+++ b/src/parse.y
@@ -4572,9 +4572,10 @@
buffer_error_messages--;
- eval_string (args(2), 0, parse_status, nargout);
-
- retval = octave_value_list ();
+ tmp = eval_string (args(2), nargout > 0,
+ parse_status, nargout);
+
+ retval = (nargout > 0) ? tmp : octave_value_list ();
}
}