gdb: add interp::on_command_error method

Same idea as the previous patches, but for command_error.

Change-Id: If6098225dd72fad8be13b3023b35bc8bc48efb9d

diff --git a/gdb/cli/cli-interp.c b/gdb/cli/cli-interp.c
index 00310542a8dbce184972f6422d7953a20e5dc8b0..ffb40729fc61d56944aea3502cb72babc875f624 100644 (file)
--- a/gdb/cli/cli-interp.c
+++ b/gdb/cli/cli-interp.c
@@ -158,15 +158,9 @@ cli_interp_base::on_sync_execution_done ()
   display_gdb_prompt (NULL);
 }
 
-/* Observer for the command_error notification.  */
-
-static void
-cli_base_on_command_error ()
+void
+cli_interp_base::on_command_error ()
 {
-  cli_interp_base *cli = as_cli_interp_base (top_level_interpreter ());
-  if (cli == nullptr)
-    return;
-
   display_gdb_prompt (NULL);
 }
 
@@ -355,8 +349,6 @@ _initialize_cli_interp ()
   interp_factory_register (INTERP_CONSOLE, cli_interp_factory);
 
   /* Note these all work for both the CLI and TUI interpreters.  */
-  gdb::observers::command_error.attach (cli_base_on_command_error,
-                                       "cli-interp-base");
   gdb::observers::user_selected_context_changed.attach
     (cli_base_on_user_selected_context_changed, "cli-interp-base");
 }

diff --git a/gdb/cli/cli-interp.h b/gdb/cli/cli-interp.h
index 4680c8070fd00bc463643907d887849f983c8ccf..5020b2bc6ef44a9b341669d8d179aa44a02a339e 100644 (file)
--- a/gdb/cli/cli-interp.h
+++ b/gdb/cli/cli-interp.h
@@ -39,6 +39,7 @@ public:
   void on_exited (int status) override;
   void on_no_history () override;
   void on_sync_execution_done () override;
+  void on_command_error () override;
 
 private:
   struct saved_output_files

diff --git a/gdb/interps.h b/gdb/interps.h
index 349ffb1bdcf7b3c8e2a26d599310b7351abfeb48..53d951b8d637b2e940d3e47fb4affde249f236fa 100644 (file)
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -106,6 +106,10 @@ public:
      finished.  */
   virtual void on_sync_execution_done () {}
 
+  /* Notify the interpreter that an error was caught while executing a
+     command on this interpreter.  */
+  virtual void on_command_error () {}
+
 private:
   /* The memory for this is static, it comes from literal strings (e.g. "cli").  */
   const char *m_name;

diff --git a/gdb/main.c b/gdb/main.c
index 5c23714f52e0e77986bdd808715d62e2f827ab32..47eec0e5073040082562be01a734cfc41dd6b186 100644 (file)
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -430,7 +430,7 @@ start_event_loop ()
             get around to resetting the prompt, which leaves readline
             in a messed-up state.  Reset it here.  */
          current_ui->prompt_state = PROMPT_NEEDED;
-         gdb::observers::command_error.notify ();
+         top_level_interpreter ()->on_command_error ();
          /* This call looks bizarre, but it is required.  If the user
             entered a command that caused an error,
             after_char_processing_hook won't be called from

diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 1cc0a6a89d5f80a7214134168739f3cffefe6a13..313d75185bceda6213d3d2e3c2dd890f941960fb 100644 (file)
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -104,14 +104,10 @@ as_mi_interp (struct interp *interp)
   return dynamic_cast<mi_interp *> (interp);
 }
 
-/* Observer for the command_error notification.  */
-
-static void
-mi_on_command_error ()
+void
+mi_interp::on_command_error ()
 {
-  mi_interp *mi = as_mi_interp (top_level_interpreter ());
-  if (mi != nullptr)
-    display_mi_prompt (mi);
+  display_mi_prompt (this);
 }
 
 void
@@ -1237,7 +1233,6 @@ _initialize_mi_interp ()
                                              "mi-interp");
   gdb::observers::command_param_changed.attach (mi_command_param_changed,
                                                "mi-interp");
-  gdb::observers::command_error.attach (mi_on_command_error, "mi-interp");
   gdb::observers::memory_changed.attach (mi_memory_changed, "mi-interp");
   gdb::observers::user_selected_context_changed.attach
     (mi_user_selected_context_changed, "mi-interp");

diff --git a/gdb/mi/mi-interp.h b/gdb/mi/mi-interp.h
index 5e826061772b36021f33d4d0953f350bf3f65b1b..6a02eeff8c1972680f6c0ab43fbafcc912f25ce0 100644 (file)
--- a/gdb/mi/mi-interp.h
+++ b/gdb/mi/mi-interp.h
@@ -48,6 +48,7 @@ public:
   void on_exited (int status) override;
   void on_no_history () override;
   void on_sync_execution_done () override;
+  void on_command_error () override;
 
   /* MI's output channels */
   mi_console_file *out;

diff --git a/gdb/observable.c b/gdb/observable.c
index f52989d7a63888113ec3c69cea3a083ee606bd67..bfb92b4fe15ea4efc9a4801bfa0e62088df0a0c5 100644 (file)
--- a/gdb/observable.c
+++ b/gdb/observable.c
@@ -34,7 +34,6 @@ bool observer_debug = false;
 
 DEFINE_OBSERVABLE (normal_stop);
 DEFINE_OBSERVABLE (signal_received);
-DEFINE_OBSERVABLE (command_error);
 DEFINE_OBSERVABLE (target_changed);
 DEFINE_OBSERVABLE (executable_changed);
 DEFINE_OBSERVABLE (inferior_created);

diff --git a/gdb/observable.h b/gdb/observable.h
index 4be05efa0231ea55d58dd85d9f3d310f506743e8..1ec927671e5350f6e3c883915ef22fccd2723ef3 100644 (file)
--- a/gdb/observable.h
+++ b/gdb/observable.h
@@ -57,9 +57,6 @@ extern observable<struct bpstat */* bs */, int /* print_frame */> normal_stop;
 /* The inferior was stopped by a signal.  */
 extern observable<enum gdb_signal /* siggnal */> signal_received;
 
-/* An error was caught while executing a command.  */
-extern observable<> command_error;
-
 /* The target's register contents have changed.  */
 extern observable<struct target_ops */* target */> target_changed;