projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use std::string in dwarf2read.c
[deliverable/binutils-gdb.git]
/
gdb
/
interps.c
diff --git
a/gdb/interps.c
b/gdb/interps.c
index 162cd838ec3b59ef76e36c461a232d7d259d93f1..65a01437d58020bb7ea52fd98c292316bb8581c8 100644
(file)
--- a/
gdb/interps.c
+++ b/
gdb/interps.c
@@
-1,6
+1,6
@@
/* Manages interpreters for GDB, the GNU debugger.
/* Manages interpreters for GDB, the GNU debugger.
- Copyright (C) 2000-20
18
Free Software Foundation, Inc.
+ Copyright (C) 2000-20
20
Free Software Foundation, Inc.
Written by Jim Ingham <jingham@apple.com> of Apple Computer, Inc.
Written by Jim Ingham <jingham@apple.com> of Apple Computer, Inc.
@@
-38,6
+38,7
@@
#include "completer.h"
#include "top.h" /* For command_loop. */
#include "continuations.h"
#include "completer.h"
#include "top.h" /* For command_loop. */
#include "continuations.h"
+#include "main.h"
/* Each UI has its own independent set of interpreters. */
/* Each UI has its own independent set of interpreters. */
@@
-78,13
+79,15
@@
static struct interp *interp_lookup_existing (struct ui *ui,
const char *name);
interp::interp (const char *name)
const char *name);
interp::interp (const char *name)
+ : m_name (xstrdup (name))
{
{
- this->name = xstrdup (name);
this->inited = false;
}
interp::~interp ()
this->inited = false;
}
interp::~interp ()
-{}
+{
+ xfree (m_name);
+}
/* An interpreter factory. Maps an interpreter name to the factory
function that instantiates an interpreter by that name. */
/* An interpreter factory. Maps an interpreter name to the factory
function that instantiates an interpreter by that name. */
@@
-129,7
+132,7
@@
interp_add (struct ui *ui, struct interp *interp)
{
struct ui_interp_info *ui_interp = get_interp_info (ui);
{
struct ui_interp_info *ui_interp = get_interp_info (ui);
- gdb_assert (interp_lookup_existing (ui, interp->name) == NULL);
+ gdb_assert (interp_lookup_existing (ui, interp->name
()
) == NULL);
interp->next = ui_interp->interp_list;
ui_interp->interp_list = interp;
interp->next = ui_interp->interp_list;
ui_interp->interp_list = interp;
@@
-170,11
+173,11
@@
interp_set (struct interp *interp, bool top_level)
/* We use interpreter_p for the "set interpreter" variable, so we need
to make sure we have a malloc'ed copy for the set command to free. */
if (interpreter_p != NULL
/* We use interpreter_p for the "set interpreter" variable, so we need
to make sure we have a malloc'ed copy for the set command to free. */
if (interpreter_p != NULL
- && strcmp (interp->name, interpreter_p) != 0)
+ && strcmp (interp->name
()
, interpreter_p) != 0)
{
xfree (interpreter_p);
{
xfree (interpreter_p);
- interpreter_p = xstrdup (interp->name);
+ interpreter_p = xstrdup (interp->name
()
);
}
/* Run the init proc. */
}
/* Run the init proc. */
@@
-206,7
+209,7
@@
interp_lookup_existing (struct ui *ui, const char *name)
interp != NULL;
interp = interp->next)
{
interp != NULL;
interp = interp->next)
{
- if (strcmp (interp->name, name) == 0)
+ if (strcmp (interp->name
()
, name) == 0)
return interp;
}
return interp;
}
@@
-251,26
+254,14
@@
set_top_level_interpreter (const char *name)
interp_set (interp, true);
}
interp_set (interp, true);
}
-/* Returns the current interpreter. */
-
-struct ui_out *
-interp_ui_out (struct interp *interp)
-{
- struct ui_interp_info *ui_interp = get_current_interp_info ();
-
- if (interp == NULL)
- interp = ui_interp->current_interpreter;
- return interp->interp_ui_out ();
-}
-
void
void
-current_interp_set_logging (ui_file_up logfile,
- bool
loggin
g_redirect)
+current_interp_set_logging (ui_file_up logfile,
bool logging_redirect,
+ bool
debu
g_redirect)
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *interp = ui_interp->current_interpreter;
{
struct ui_interp_info *ui_interp = get_current_interp_info ();
struct interp *interp = ui_interp->current_interpreter;
- interp->set_logging (std::move (logfile), logging_redirect);
+ interp->set_logging (std::move (logfile), logging_redirect
, debug_redirect
);
}
/* Temporarily overrides the current interpreter. */
}
/* Temporarily overrides the current interpreter. */
@@
-286,14
+277,6
@@
scoped_restore_interp::set_interp (const char *name)
return old_interp;
}
return old_interp;
}
-/* Returns the interpreter's name. */
-
-const char *
-interp_name (struct interp *interp)
-{
- return interp->name;
-}
-
/* Returns true if the current interp is the passed in name. */
int
current_interp_named_p (const char *interp_name)
/* Returns true if the current interp is the passed in name. */
int
current_interp_named_p (const char *interp_name)
@@
-302,7
+285,7
@@
current_interp_named_p (const char *interp_name)
struct interp *interp = ui_interp->current_interpreter;
if (interp != NULL)
struct interp *interp = ui_interp->current_interpreter;
if (interp != NULL)
- return (strcmp (interp->name, interp_name) == 0);
+ return (strcmp (interp->name
()
, interp_name) == 0);
return 0;
}
return 0;
}
@@
-370,7
+353,6
@@
clear_interpreter_hooks (void)
/*print_frame_more_info_hook = 0; */
deprecated_query_hook = 0;
deprecated_warning_hook = 0;
/*print_frame_more_info_hook = 0; */
deprecated_query_hook = 0;
deprecated_warning_hook = 0;
- deprecated_interactive_hook = 0;
deprecated_readline_begin_hook = 0;
deprecated_readline_hook = 0;
deprecated_readline_end_hook = 0;
deprecated_readline_begin_hook = 0;
deprecated_readline_hook = 0;
deprecated_readline_end_hook = 0;
@@
-395,7
+377,7
@@
interpreter_exec_cmd (const char *args, int from_tty)
nrules = prules.count ();
if (nrules < 2)
nrules = prules.count ();
if (nrules < 2)
- error (_("
usage: interpreter-exec <interpreter> [ <command> ... ]
"));
+ error (_("
Usage: interpreter-exec INTERPRETER COMMAND...
"));
old_interp = ui_interp->current_interpreter;
old_interp = ui_interp->current_interpreter;
@@
-464,8
+446,12
@@
_initialize_interpreter (void)
c = add_cmd ("interpreter-exec", class_support,
interpreter_exec_cmd, _("\
c = add_cmd ("interpreter-exec", class_support,
interpreter_exec_cmd, _("\
-Execute a command in an interpreter. It takes two arguments:\n\
+Execute a command in an interpreter.\n\
+Usage: interpreter-exec INTERPRETER COMMAND...\n\
The first argument is the name of the interpreter to use.\n\
The first argument is the name of the interpreter to use.\n\
-The second argument is the command to execute.\n"), &cmdlist);
+The following arguments are the commands to execute.\n\
+A command can have arguments, separated by spaces.\n\
+These spaces must be escaped using \\ or the command\n\
+and its arguments must be enclosed in double quotes."), &cmdlist);
set_cmd_completer (c, interpreter_completer);
}
set_cmd_completer (c, interpreter_completer);
}
This page took
0.026259 seconds
and
4
git commands to generate.