Mercurial > octave
diff libinterp/corefcn/error.cc @ 22196:dd992fd74fce
put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
* oct-parse.in.yy, parse.h: Move parser classes to octave namespace.
* lex.ll, lex.h: Move lexer classes to octave namespace.
* pt-eval.h, pt-eval.cc: Move evaluator class to octave namespace.
Don't define global current evaluator pointer here.
* debug.cc, error.cc, input.cc, input.h, ls-mat-ascii.cc, pt-jit.cc,
sighandlers.cc, utils.cc, variables.cc, ov-usr-fcn.cc, pt-assign.cc,
pt-exp.h, pt-id.cc: Update for namespaces.
* interpreter.cc, interpreter.h (current_evaluator): New global var.
(interpreter::m_evaluator): New data member.
(interpreter::~interpreter): Delete evaluator.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 12 Jul 2016 14:28:07 -0400 |
| parents | 879f297f3194 |
| children | cf18d6e791a1 |
line wrap: on
line diff
--- a/libinterp/corefcn/error.cc Mon Aug 01 09:52:51 2016 -0700 +++ b/libinterp/corefcn/error.cc Tue Jul 12 14:28:07 2016 -0400 @@ -325,9 +325,9 @@ frame.protect_var (Vdebug_on_error); Vdebug_on_error = false; - tree_evaluator::debug_mode = true; + octave::tree_evaluator::debug_mode = true; - tree_evaluator::current_frame = octave_call_stack::current_frame (); + octave::tree_evaluator::current_frame = octave_call_stack::current_frame (); if (show_stack_trace) { @@ -731,9 +731,9 @@ frame.protect_var (Vdebug_on_warning); Vdebug_on_warning = false; - tree_evaluator::debug_mode = true; + octave::tree_evaluator::debug_mode = true; - tree_evaluator::current_frame = octave_call_stack::current_frame (); + octave::tree_evaluator::current_frame = octave_call_stack::current_frame (); do_keyboard (octave_value_list ()); }