Mercurial > octave

comparison libinterp/corefcn/error.cc @ 22196:dd992fd74fce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
22195:93ed9396f2c3 22196:dd992fd74fce
323 { 323 {
324 octave::unwind_protect frame; 324 octave::unwind_protect frame;
325 frame.protect_var (Vdebug_on_error); 325 frame.protect_var (Vdebug_on_error);
326 Vdebug_on_error = false; 326 Vdebug_on_error = false;
327 327
328 tree_evaluator::debug_mode = true; 328 octave::tree_evaluator::debug_mode = true;
329 329
330 tree_evaluator::current_frame = octave_call_stack::current_frame (); 330 octave::tree_evaluator::current_frame = octave_call_stack::current_frame ();
331 331
332 if (show_stack_trace) 332 if (show_stack_trace)
333 { 333 {
334 std::string stack_trace = e.info (); 334 std::string stack_trace = e.info ();
335 335
729 { 729 {
730 octave::unwind_protect frame; 730 octave::unwind_protect frame;
731 frame.protect_var (Vdebug_on_warning); 731 frame.protect_var (Vdebug_on_warning);
732 Vdebug_on_warning = false; 732 Vdebug_on_warning = false;
733 733
734 tree_evaluator::debug_mode = true; 734 octave::tree_evaluator::debug_mode = true;
735 735
736 tree_evaluator::current_frame = octave_call_stack::current_frame (); 736 octave::tree_evaluator::current_frame = octave_call_stack::current_frame ();
737 737
738 do_keyboard (octave_value_list ()); 738 do_keyboard (octave_value_list ());
739 } 739 }
740 } 740 }
741 } 741 }