Pass readable_regcache to gdbarch method read_pc

[deliverable/binutils-gdb.git] / gdb / interps.h

diff --git a/gdb/interps.h b/gdb/interps.h
index e56498042a601328b8a6159df327023f2537bd9a..067c9ddefd70a304ca24c5ba3716391146f08b78 100644 (file)
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -1,6 +1,6 @@
 /* Manages interpreters for GDB, the GNU debugger.
 
-   Copyright (C) 2000-2017 Free Software Foundation, Inc.
+   Copyright (C) 2000-2018 Free Software Foundation, Inc.
 
    Written by Jim Ingham <jingham@apple.com> of Apple Computer, Inc.
 
@@ -35,11 +35,8 @@ typedef struct interp *(*interp_factory_func) (const char *name);
 extern void interp_factory_register (const char *name,
                                     interp_factory_func func);
 
-extern int interp_resume (struct interp *interp);
-extern int interp_suspend (struct interp *interp);
 extern struct gdb_exception interp_exec (struct interp *interp,
                                         const char *command);
-extern int interp_quiet_p (struct interp *interp);
 
 class interp
 {
@@ -86,12 +83,9 @@ public:
 
   /* Has the init method been run?  */
   bool inited;
-
-  bool quiet_p;
 };
 
 extern void interp_add (struct ui *ui, struct interp *interp);
-extern void interp_set (struct interp *interp, bool top_level);
 
 /* Look up the interpreter for NAME, creating one if none exists yet.
    If NAME is not a interpreter type previously registered with
@@ -106,7 +100,32 @@ extern void set_top_level_interpreter (const char *name);
 
 extern struct ui_out *interp_ui_out (struct interp *interp);
 extern const char *interp_name (struct interp *interp);
-extern struct interp *interp_set_temp (const char *name);
+
+/* Temporarily set the current interpreter, and reset it on
+   destruction.  */
+class scoped_restore_interp
+{
+public:
+
+  scoped_restore_interp (const char *name)
+    : m_interp (set_interp (name))
+  {
+  }
+
+  ~scoped_restore_interp ()
+  {
+    set_interp (interp_name (m_interp));
+  }
+
+  scoped_restore_interp (const scoped_restore_interp &) = delete;
+  scoped_restore_interp &operator= (const scoped_restore_interp &) = delete;
+
+private:
+
+  struct interp *set_interp (const char *name);
+
+  struct interp *m_interp;
+};
 
 extern int current_interp_named_p (const char *name);
 
@@ -142,9 +161,10 @@ extern void interp_pre_command_loop (struct interp *interp);
 
 /* List the possible interpreters which could complete the given
    text.  */
-extern VEC (char_ptr) *interpreter_completer (struct cmd_list_element *ignore,
-                                             const char *text,
-                                             const char *word);
+extern void interpreter_completer (struct cmd_list_element *ignore,
+                                  completion_tracker &tracker,
+                                  const char *text,
+                                  const char *word);
 
 /* well-known interpreters */
 #define INTERP_CONSOLE         "console"