Mercurial > octave
comparison libinterp/corefcn/sighandlers.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 | 9203833cab7d |
| children | bac0d6f07a3e |
comparison
equal
deleted
inserted
replaced
| 22195:93ed9396f2c3 | 22196:dd992fd74fce |
|---|---|
| 488 { | 488 { |
| 489 if (Vdebug_on_interrupt) | 489 if (Vdebug_on_interrupt) |
| 490 { | 490 { |
| 491 if (! octave_debug_on_interrupt_state) | 491 if (! octave_debug_on_interrupt_state) |
| 492 { | 492 { |
| 493 tree_evaluator::debug_mode = true; | 493 octave::tree_evaluator::debug_mode = true; |
| 494 octave_debug_on_interrupt_state = true; | 494 octave_debug_on_interrupt_state = true; |
| 495 | 495 |
| 496 return; | 496 return; |
| 497 } | 497 } |
| 498 else | 498 else |
| 499 { | 499 { |
| 500 // Clear the flag and do normal interrupt stuff. | 500 // Clear the flag and do normal interrupt stuff. |
| 501 | 501 |
| 502 tree_evaluator::debug_mode | 502 octave::tree_evaluator::debug_mode |
| 503 = bp_table::have_breakpoints () || Vdebugging; | 503 = bp_table::have_breakpoints () || Vdebugging; |
| 504 octave_debug_on_interrupt_state = false; | 504 octave_debug_on_interrupt_state = false; |
| 505 } | 505 } |
| 506 } | 506 } |
| 507 | 507 |