Mercurial > octave-nkf
changeset 11023:cb62c7401ea2
toplev.cc (Fquit): allow any number of output paramters
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 25 Sep 2010 17:17:51 -0400 |
| parents | a5bee81bb69f |
| children | fa56fd98c0c5 |
| files | src/ChangeLog src/toplev.cc |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Sep 25 11:59:01 2010 -0400 +++ b/src/ChangeLog Sat Sep 25 17:17:51 2010 -0400 @@ -1,3 +1,7 @@ +2010-09-25 John W. Eaton <jwe@octave.org> + + * toplev.cc (Fquit): Allow any number of output parameters. + 2010-09-25 Jaroslav Hajek <highegg@gmail.com> * DLD-FUNCTIONS/gcd.cc (Fgcd): Rewrite. Use more efficient code.
--- a/src/toplev.cc Sat Sep 25 11:59:01 2010 -0400 +++ b/src/toplev.cc Sat Sep 25 17:17:51 2010 -0400 @@ -676,7 +676,7 @@ (*octave_exit) (retval == EOF ? 0 : retval); } -DEFUN (quit, args, nargout, +DEFUN (quit, args, , "-*- texinfo -*-\n\ @deftypefn {Built-in Function} {} exit (@var{status})\n\ @deftypefnx {Built-in Function} {} quit (@var{status})\n\ @@ -689,7 +689,7 @@ if (! quit_allowed) error ("quit: not supported in embedded mode."); - else if (nargout == 0) + else { if (args.length () > 0) { @@ -710,8 +710,6 @@ octave_throw_interrupt_exception (); } } - else - error ("quit: invalid number of output arguments"); return retval; }