Mercurial > octave-nkf
comparison libinterp/octave-value/ov-usr-fcn.cc @ 20619:eef93a493ce3
use new cell_value method to handle value extraction errors
* cellfun.cc, ov-class.cc, ov-struct.cc, ov-usr-fcn.cc:
Use new cell_value method.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 09 Oct 2015 14:43:36 -0400 |
| parents | b10432a40432 |
| children |
comparison
equal
deleted
inserted
replaced
| 20618:e5986cba4ca8 | 20619:eef93a493ce3 |
|---|---|
| 633 if (ret_list->takes_varargs ()) | 633 if (ret_list->takes_varargs ()) |
| 634 { | 634 { |
| 635 octave_value varargout_varval = symbol_table::varval ("varargout"); | 635 octave_value varargout_varval = symbol_table::varval ("varargout"); |
| 636 | 636 |
| 637 if (varargout_varval.is_defined ()) | 637 if (varargout_varval.is_defined ()) |
| 638 { | 638 varargout = varargout_varval.cell_value ("expecting varargout to be a cell array object"); |
| 639 varargout = varargout_varval.cell_value (); | |
| 640 | |
| 641 if (error_state) | |
| 642 error ("expecting varargout to be a cell array object"); | |
| 643 } | |
| 644 } | 639 } |
| 645 | 640 |
| 646 retval = ret_list->convert_to_const_vector (nargout, varargout); | 641 retval = ret_list->convert_to_const_vector (nargout, varargout); |
| 647 } | 642 } |
| 648 | 643 |