Mercurial > octave
diff libgui/src/qt-interpreter-events.cc @ 27392:820a87b87c01
clean up use of interpreter in qt_interpreter_events::enter_debugger_event
* qt-interpreter-events.h, qt-interpreter-events.cc
(qt_interpreter_events::enter_debugger_event):
New argument, fcn_file_name. Use it instead of calling interpreter
functions to determine whether to open the file
* event-manager.h (event_manager::enter_debugger_event):
New argument, fcn_file_name.
* pt-eval.cc (debugger::repl): Pass fcn name and file name to
enter_debugger_event.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 11 Sep 2019 16:40:19 -0400 |
| parents | 0040b7668518 |
| children | 930c0fbc003b |
line wrap: on
line diff
--- a/libgui/src/qt-interpreter-events.cc Wed Sep 11 13:38:40 2019 -0400 +++ b/libgui/src/qt-interpreter-events.cc Wed Sep 11 16:40:19 2019 -0400 @@ -487,20 +487,14 @@ void qt_interpreter_events::post_input_event (void) { } - void qt_interpreter_events::enter_debugger_event (const std::string& file, + void qt_interpreter_events::enter_debugger_event (const std::string& /*fcn_name*/, + const std::string& fcn_file_name, int line) { - interpreter& interp - = __get_interpreter__ ("qt_interpreter_events::enter_debugger_event"); - - octave_value_list fct = F__which__ (interp, ovl (file),0); - octave_map map = fct(0).map_value (); - - std::string type = map.contents ("type").data ()[0].string_value (); - if (type == "command-line function") + if (fcn_file_name.empty ()) return; - insert_debugger_pointer (file, line); + insert_debugger_pointer (fcn_file_name, line); emit enter_debugger_signal (); }