Mercurial > hg > octave-nkf
comparison src/ov-fcn-handle.cc @ 12483:7a5aacf65f81
Rewrite error strings in src/ to use variables named in documentation.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Sat, 26 Feb 2011 17:28:11 -0800 |
parents | 12df7854fa7c |
children | 65b7ce254ba3 |
comparison
equal
deleted
inserted
replaced
12482:3244c6e0af4a | 12483:7a5aacf65f81 |
---|---|
1644 m.setfield ("file", ""); | 1644 m.setfield ("file", ""); |
1645 | 1645 |
1646 retval = m; | 1646 retval = m; |
1647 } | 1647 } |
1648 else | 1648 else |
1649 error ("functions: invalid function handle object"); | 1649 error ("functions: FCN_HANDLE is not a valid function handle object"); |
1650 } | 1650 } |
1651 else | 1651 else |
1652 error ("functions: argument must be a function handle object"); | 1652 error ("functions: FCN_HANDLE argument must be a function handle object"); |
1653 } | 1653 } |
1654 else | 1654 else |
1655 print_usage (); | 1655 print_usage (); |
1656 | 1656 |
1657 return retval; | 1657 return retval; |
1684 } | 1684 } |
1685 else | 1685 else |
1686 retval = fh_nm; | 1686 retval = fh_nm; |
1687 } | 1687 } |
1688 else | 1688 else |
1689 error ("func2str: expecting valid function handle as first argument"); | 1689 error ("func2str: FCN_HANDLE must be a valid function handle"); |
1690 } | 1690 } |
1691 else | 1691 else |
1692 print_usage (); | 1692 print_usage (); |
1693 | 1693 |
1694 return retval; | 1694 return retval; |
1711 std::string nm = args(0).string_value (); | 1711 std::string nm = args(0).string_value (); |
1712 | 1712 |
1713 if (! error_state) | 1713 if (! error_state) |
1714 retval = make_fcn_handle (nm, nargin != 2); | 1714 retval = make_fcn_handle (nm, nargin != 2); |
1715 else | 1715 else |
1716 error ("str2func: expecting string as first argument"); | 1716 error ("str2func: FCN_NAME must be a string"); |
1717 } | 1717 } |
1718 else | 1718 else |
1719 print_usage (); | 1719 print_usage (); |
1720 | 1720 |
1721 return retval; | 1721 return retval; |