Mercurial > octave

diff libinterp/corefcn/input.cc @ 27301:a2b1ba6c92d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate unnecessary application::interative function * octave.h, octave.cc (application_interactive): Delete functions. Change all uses to check interactive state of interpreter directly from interpreter object.
author John W. Eaton <jwe@octave.org>
date Sun, 28 Jul 2019 17:24:42 -0400
parents 9de4741a896e
children 50216d7a2f6b
line wrap: on
line diff
--- a/libinterp/corefcn/input.cc	Mon Jul 29 14:38:40 2019 -0700
+++ b/libinterp/corefcn/input.cc	Sun Jul 28 17:24:42 2019 -0400
@@ -544,7 +544,7 @@
   {
     Vlast_prompt_time.stamp ();
 
-    if (Vdrawnow_requested && application::interactive ())
+    if (Vdrawnow_requested && m_interpreter.interactive ())
       {
         bool eval_error = false;
 
@@ -561,7 +561,7 @@
             if (! stack_trace.empty ())
               std::cerr << stack_trace;
 
-            if (application::interactive ())
+            if (m_interpreter.interactive ())
               interpreter::recover_from_exception ();
           }
 
@@ -701,7 +701,7 @@
 
     event_manager& evmgr = interp.get_event_manager ();
 
-    if (application::interactive ())
+    if (interp.interactive ())
       {
         if (! tw.in_debug_repl ())
           evmgr.exit_debugger_event ();
@@ -768,7 +768,7 @@
     // Process post input event hook function after the internal history
     // list has been updated.
 
-    if (application::interactive ())
+    if (interp.interactive ())
       evmgr.post_input_event ();
 
     return retval;