# HG changeset patch # User Rik # Date 1326063885 28800 # Node ID cba1c681f1b7281c3d31a4c1f633a5eb05bda18a # Parent 2ced2f59f5237ab8096a0ed17d06393361d34483 doc: Update seealso references for eval family of functions. oct-parse.yy: Update seealso references for eval family of functions. diff -r 2ced2f59f523 -r cba1c681f1b7 src/oct-parse.yy --- a/src/oct-parse.yy Sun Jan 08 13:39:44 2012 -0800 +++ b/src/oct-parse.yy Sun Jan 08 15:04:45 2012 -0800 @@ -4448,7 +4448,8 @@ DEFUN (eval, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} eval (@var{try}, @var{catch})\n\ +@deftypefn {Built-in Function} {} eval (@var{try})\n\ +@deftypefnx {Built-in Function} {} eval (@var{try}, @var{catch})\n\ Parse the string @var{try} and evaluate it as if it were an Octave\n\ program. If that fails, evaluate the optional string @var{catch}.\n\ The string @var{try} is evaluated in the current context,\n\ @@ -4472,6 +4473,11 @@ This is a bad example\n\ @end group\n\ @end example\n\ +\n\ +Consider using try/catch blocks instead if you are only using @code{eval}\n\ +as an error-capturing mechanism rather than for the execution of arbitrary\n\ +code strings.\n\ +@seealso{evalin}\n\ @end deftypefn") { octave_value_list retval; @@ -4554,6 +4560,7 @@ @deftypefn {Built-in Function} {} assignin (@var{context}, @var{varname}, @var{value})\n\ Assign @var{value} to @var{varname} in context @var{context}, which\n\ may be either @code{\"base\"} or @code{\"caller\"}.\n\ +@seealso{evalin}\n\ @end deftypefn") { octave_value_list retval; @@ -4603,10 +4610,12 @@ DEFUN (evalin, args, nargout, "-*- texinfo -*-\n\ -@deftypefn {Built-in Function} {} evalin (@var{context}, @var{try}, @var{catch})\n\ +@deftypefn {Built-in Function} {} evalin (@var{context}, @var{try})\n\ +@deftypefnx {Built-in Function} {} evalin (@var{context}, @var{try}, @var{catch})\n\ Like @code{eval}, except that the expressions are evaluated in the\n\ context @var{context}, which may be either @code{\"caller\"} or\n\ @code{\"base\"}.\n\ +@seealso{eval, assignin}\n\ @end deftypefn") { octave_value_list retval;