Mercurial > octave
diff libinterp/corefcn/interpreter.cc @ 26113:8a15f3bace49
move eval_string inside interpreter/evaluator class
* tree_evaluator.h, tree_evaluator.cc (tree_evaluator::eval_string):
New functions.
* interpreter.h, interpreter.cc (interpreter::eval_string): New
functions. Forward to evaluator eval_string functions.
* parse.h, oct-parse.yy (eval_string): Deprecate and forward to
interpreter eval_string functions. Change all uses.
* pt.h, pt.cc (tree::meets_bp_condition): Accept reference to
tree_evaluator as argument. Change all uses.
(tree::is_breakpoint): Split into separate is_breakpoint and
is_active_breakpoint functions. Change all uses.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Fri, 16 Nov 2018 13:16:50 -0500 |
| parents | f881d3e271d2 |
| children | 00f796120a6d |
line wrap: on
line diff
--- a/libinterp/corefcn/interpreter.cc Tue Dec 20 03:25:17 2016 +0000 +++ b/libinterp/corefcn/interpreter.cc Fri Nov 16 13:16:50 2018 -0500 @@ -1130,6 +1130,26 @@ return retval; } + octave_value_list interpreter::eval_string (const std::string& eval_str, + bool silent, int& parse_status, + int nargout) + { + return m_evaluator.eval_string (eval_str, silent, parse_status, nargout); + } + + octave_value interpreter::eval_string (const std::string& eval_str, + bool silent, int& parse_status) + { + return m_evaluator.eval_string (eval_str, silent, parse_status); + } + + octave_value_list interpreter::eval_string (const octave_value& arg, + bool silent, int& parse_status, + int nargout) + { + return m_evaluator.eval_string (arg, silent, parse_status, nargout); + } + void interpreter::recover_from_exception (void) { can_interrupt = true;