diff libinterp/corefcn/event-manager.h @ 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 a0d49e55acae
line wrap: on
line diff
--- a/libinterp/corefcn/event-manager.h	Wed Sep 11 13:38:40 2019 -0400
+++ b/libinterp/corefcn/event-manager.h	Wed Sep 11 16:40:19 2019 -0400
@@ -185,7 +185,10 @@
     virtual void post_input_event (void) { }
 
     virtual void
-    enter_debugger_event (const std::string& /*file*/, int /*line*/) { }
+    enter_debugger_event (const std::string& /*fcn_name*/,
+                          const std::string& /*fcn_file_name*/,
+                          int /*line*/)
+    { }
 
     virtual void
     execute_in_debugger_event (const std::string& /*file*/, int /*line*/) { }
@@ -456,13 +459,14 @@
         instance->post_input_event ();
     }
 
-    void enter_debugger_event (const std::string& file, int line)
+    void enter_debugger_event (const std::string& fcn_name,
+                               const std::string& fcn_file_name, int line)
     {
       if (enabled ())
         {
           debugging = true;
 
-          instance->enter_debugger_event (file, line);
+          instance->enter_debugger_event (fcn_name, fcn_file_name, line);
         }
     }