1 files changed, 30 insertions, 28 deletions

diff --git a/gdb/interps.h b/gdb/interps.h
index ef2ceeb..e564980 100644
--- a/gdb/interps.h
+++ b/gdb/interps.h
@@ -41,53 +41,57 @@ extern struct gdb_exception interp_exec (struct interp *interp,
 					 const char *command);
 extern int interp_quiet_p (struct interp *interp);
 
-typedef void *(interp_init_ftype) (struct interp *self, int top_level);
-typedef int (interp_resume_ftype) (void *data);
-typedef int (interp_suspend_ftype) (void *data);
-typedef struct gdb_exception (interp_exec_ftype) (void *data,
-						  const char *command);
-typedef void (interp_pre_command_loop_ftype) (struct interp *self);
-typedef struct ui_out *(interp_ui_out_ftype) (struct interp *self);
+class interp
+{
+public:
+  explicit interp (const char *name);
+  virtual ~interp () = 0;
 
-typedef void (interp_set_logging_ftype) (struct interp *self,
-					 ui_file_up logfile,
-					 bool logging_redirect);
+  virtual void init (bool top_level)
+  {}
 
-typedef int (interp_supports_command_editing_ftype) (struct interp *self);
+  virtual void resume () = 0;
+  virtual void suspend () = 0;
 
-struct interp_procs
-{
-  interp_init_ftype *init_proc;
-  interp_resume_ftype *resume_proc;
-  interp_suspend_ftype *suspend_proc;
-  interp_exec_ftype *exec_proc;
+  virtual gdb_exception exec (const char *command) = 0;
 
   /* Returns the ui_out currently used to collect results for this
      interpreter.  It can be a formatter for stdout, as is the case
      for the console & mi outputs, or it might be a result
      formatter.  */
-  interp_ui_out_ftype *ui_out_proc;
+  virtual ui_out *interp_ui_out () = 0;
 
   /* Provides a hook for interpreters to do any additional
      setup/cleanup that they might need when logging is enabled or
      disabled.  */
-  interp_set_logging_ftype *set_logging_proc;
+  virtual void set_logging (ui_file_up logfile, bool logging_redirect) = 0;
 
   /* Called before starting an event loop, to give the interpreter a
      chance to e.g., print a prompt.  */
-  interp_pre_command_loop_ftype *pre_command_loop_proc;
+  virtual void pre_command_loop ()
+  {}
 
   /* Returns true if this interpreter supports using the readline
      library; false if it uses GDB's own simplified readline
      emulation.  */
-  interp_supports_command_editing_ftype *supports_command_editing_proc;
+  virtual bool supports_command_editing ()
+  { return false; }
+
+  /* This is the name in "-i=" and "set interpreter".  */
+  const char *name;
+
+  /* Interpreters are stored in a linked list, this is the next
+     one...  */
+  struct interp *next;
+
+  /* Has the init method been run?  */
+  bool inited;
+
+  bool quiet_p;
 };
 
-extern struct interp *interp_new (const char *name,
-				  const struct interp_procs *procs,
-				  void *data);
 extern void interp_add (struct ui *ui, struct interp *interp);
-extern int interp_set (struct interp *interp, int top_level);
+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
@@ -101,7 +105,6 @@ extern struct interp *interp_lookup (struct ui *ui, const char *name);
 extern void set_top_level_interpreter (const char *name);
 
 extern struct ui_out *interp_ui_out (struct interp *interp);
-extern void *interp_data (struct interp *interp);
 extern const char *interp_name (struct interp *interp);
 extern struct interp *interp_set_temp (const char *name);
 
@@ -119,8 +122,7 @@ extern int current_interp_named_p (const char *name);
 extern void current_interp_set_logging (ui_file_up logfile,
 					bool logging_redirect);
 
-/* Returns opaque data associated with the top-level interpreter.  */
-extern void *top_level_interpreter_data (void);
+/* Returns the top-level interpreter.  */
 extern struct interp *top_level_interpreter (void);
 
 /* Return the current UI's current interpreter.  */