Mercurial > hg > octave-thorsten
diff src/toplev.cc @ 2891:1a30f46e1870
[project @ 1997-04-28 01:49:00 by jwe]
| author | jwe |
|---|---|
| date | Mon, 28 Apr 1997 02:01:22 +0000 |
| parents | 95e85daad148 |
| children | 8303749672be |
line wrap: on
line diff
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -61,12 +61,12 @@ #include "oct-hist.h" #include "oct-map.h" #include "oct-obj.h" +#include "oct-sym.h" #include "pager.h" #include "parse.h" #include "pathsearch.h" #include "procstream.h" #include "ov.h" -#include "pt-fvc.h" #include "pt-misc.h" #include "pt-plot.h" #include "sighandlers.h" @@ -128,7 +128,7 @@ tree_statement_list *global_command = 0; // Pointer to function that is currently being evaluated. -tree_function *curr_function = 0; +octave_user_function *curr_function = 0; // Nonzero means input is coming from startup file. int input_from_startup_file = 0; @@ -497,7 +497,8 @@ { octave_value_list retval; - tree_fvc *fcn = is_valid_function (args(0), "feval", 1); + octave_symbol *fcn = is_valid_function (args(0), "feval", 1); + if (fcn) { int tmp_nargin = args.length () - 1; @@ -505,7 +506,7 @@ tmp_args.resize (tmp_nargin); for (int i = 0; i < tmp_nargin; i++) tmp_args(i) = args(i+1); - retval = fcn->eval (false, nargout, tmp_args); + retval = fcn->eval (nargout, tmp_args); } return retval;