changeset 12059:6ab2598a4ac2
release-3-2-x
parse.y (Fevalin): also return output from CATCH expression
author |
John W. Eaton <jwe@octave.org> |
date |
Mon, 10 Aug 2009 11:14:46 +0200 |
parents |
0cb90d7fe46a |
children |
aff7a8e7d8b9 |
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-06 Jaroslav Hajek <highegg@gmail.com>
* OPERATORS/op-dm-template.cc, OPERATORS/op-pm-template.cc:
--- a/src/parse.y
+++ b/src/parse.y
@@ -4280,9 +4280,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 ();
}
}