/* C preprocessor macro expansion commands for GDB.
- Copyright (C) 2002-2013 Free Software Foundation, Inc.
+ Copyright (C) 2002-2017 Free Software Foundation, Inc.
Contributed by Red Hat, Inc.
This file is part of GDB.
#include "cli/cli-utils.h"
#include "command.h"
#include "gdbcmd.h"
-#include "gdb_string.h"
#include "linespec.h"
\f
static struct cmd_list_element *macrolist;
static void
-macro_command (char *arg, int from_tty)
+macro_command (const char *arg, int from_tty)
{
printf_unfiltered
("\"macro\" must be followed by the name of a macro command.\n");
- help_list (macrolist, "macro ", -1, gdb_stdout);
+ help_list (macrolist, "macro ", all_commands, gdb_stdout);
}
/* Prints an informational message regarding the lack of macro information. */
-static void macro_inform_no_debuginfo()
+static void
+macro_inform_no_debuginfo (void)
{
- fputs_filtered ("GDB has no preprocessor macro information for "
- "that code.",
- gdb_stdout);
+ puts_filtered ("GDB has no preprocessor macro information for that code.\n");
}
static void
-macro_expand_command (char *exp, int from_tty)
+macro_expand_command (const char *exp, int from_tty)
{
struct macro_scope *ms = NULL;
char *expanded = NULL;
static void
-macro_expand_once_command (char *exp, int from_tty)
+macro_expand_once_command (const char *exp, int from_tty)
{
struct macro_scope *ms = NULL;
char *expanded = NULL;
struct macro_source_file *file,
int line)
{
- fprintf_filtered (stream, "%s:%d\n", file->filename, line);
+ char *fullname;
+
+ fullname = macro_source_fullname (file);
+ fprintf_filtered (stream, "%s:%d\n", fullname, line);
+ xfree (fullname);
while (file->included_by)
{
- fprintf_filtered (gdb_stdout, " included at %s:%d\n",
- file->included_by->filename,
+ fullname = macro_source_fullname (file->included_by);
+ fprintf_filtered (gdb_stdout, " included at %s:%d\n", fullname,
file->included_at_line);
+ xfree (fullname);
file = file->included_by;
}
}
struct macro_source_file *file,
int line)
{
- fprintf_filtered (gdb_stdout, "Defined at ");
- show_pp_source_pos (gdb_stdout, file, line);
+ fprintf_filtered (gdb_stdout, "Defined at ");
+ show_pp_source_pos (gdb_stdout, file, line);
- if (line != 0)
- fprintf_filtered (gdb_stdout, "#define %s", name);
- else
- fprintf_filtered (gdb_stdout, "-D%s", name);
+ if (line != 0)
+ fprintf_filtered (gdb_stdout, "#define %s", name);
+ else
+ fprintf_filtered (gdb_stdout, "-D%s", name);
- if (d->kind == macro_function_like)
- {
- int i;
-
- fputs_filtered ("(", gdb_stdout);
- for (i = 0; i < d->argc; i++)
- {
- fputs_filtered (d->argv[i], gdb_stdout);
- if (i + 1 < d->argc)
- fputs_filtered (", ", gdb_stdout);
- }
- fputs_filtered (")", gdb_stdout);
- }
-
- if (line != 0)
- fprintf_filtered (gdb_stdout, " %s\n", d->replacement);
- else
- fprintf_filtered (gdb_stdout, "=%s\n", d->replacement);
-}
+ if (d->kind == macro_function_like)
+ {
+ int i;
-/* A callback function for usage with macro_for_each and friends.
- If USER_DATA is null all macros will be printed.
- Otherwise USER_DATA is considered to be a string, printing
- only macros who's NAME matches USER_DATA. Other arguments are
- routed to print_macro_definition. */
-static void
-print_macro_callback (const char *name, const struct macro_definition *macro,
- struct macro_source_file *source, int line,
- void *user_data)
-{
- if (! user_data || strcmp (user_data, name) == 0)
- print_macro_definition (name, macro, source, line);
+ fputs_filtered ("(", gdb_stdout);
+ for (i = 0; i < d->argc; i++)
+ {
+ fputs_filtered (d->argv[i], gdb_stdout);
+ if (i + 1 < d->argc)
+ fputs_filtered (", ", gdb_stdout);
+ }
+ fputs_filtered (")", gdb_stdout);
+ }
+
+ if (line != 0)
+ fprintf_filtered (gdb_stdout, " %s\n", d->replacement);
+ else
+ fprintf_filtered (gdb_stdout, "=%s\n", d->replacement);
}
/* The implementation of the `info macro' command. */
if (! ms)
macro_inform_no_debuginfo ();
else if (show_all_macros_named)
- macro_for_each (ms->file->table, print_macro_callback, name);
+ macro_for_each (ms->file->table, [&] (const char *macro_name,
+ const macro_definition *macro,
+ macro_source_file *source,
+ int line)
+ {
+ if (strcmp (name, macro_name) == 0)
+ print_macro_definition (name, macro, source, line);
+ });
else
{
struct macro_definition *d;
ms = default_macro_scope ();
else
{
- struct symtabs_and_lines sals =
- decode_line_with_current_source (args, 0);
+ std::vector<symtab_and_line> sals
+ = decode_line_with_current_source (args, 0);
- if (sals.nelts)
- ms = sal_macro_scope (sals.sals[0]);
+ if (!sals.empty ())
+ ms = sal_macro_scope (sals[0]);
}
if (! ms || ! ms->file || ! ms->file->table)
macro_inform_no_debuginfo ();
else
- macro_for_each_in_scope (ms->file, ms->line, print_macro_callback, NULL);
+ macro_for_each_in_scope (ms->file, ms->line, print_macro_definition);
do_cleanups (cleanup_chain);
}
/* User-defined macros. */
static void
-skip_ws (char **expp)
+skip_ws (const char **expp)
{
while (macro_is_whitespace (**expp))
++*expp;
parameters. */
static char *
-extract_identifier (char **expp, int is_parameter)
+extract_identifier (const char **expp, int is_parameter)
{
char *result;
- char *p = *expp;
+ const char *p = *expp;
unsigned int len;
- if (is_parameter && !strncmp (p, "...", 3))
+ if (is_parameter && startswith (p, "..."))
{
/* Ok. */
}
;
}
- if (is_parameter && !strncmp (p, "...", 3))
+ if (is_parameter && startswith (p, "..."))
p += 3;
len = p - *expp;
}
static void
-macro_define_command (char *exp, int from_tty)
+macro_define_command (const char *exp, int from_tty)
{
struct macro_definition new_macro;
char *name = NULL;
{
/* Function-like macro. */
int alloced = 5;
- char **argv = (char **) xmalloc (alloced * sizeof (char *));
+ char **argv = XNEWVEC (char *, alloced);
new_macro.kind = macro_function_like;
new_macro.argc = 0;
static void
-macro_undef_command (char *exp, int from_tty)
+macro_undef_command (const char *exp, int from_tty)
{
char *name;
static void
print_one_macro (const char *name, const struct macro_definition *macro,
- struct macro_source_file *source, int line,
- void *ignore)
+ struct macro_source_file *source, int line)
{
fprintf_filtered (gdb_stdout, "macro define %s", name);
if (macro->kind == macro_function_like)
static void
-macro_list_command (char *exp, int from_tty)
+macro_list_command (const char *exp, int from_tty)
{
- macro_for_each (macro_user_macros, print_one_macro, NULL);
+ macro_for_each (macro_user_macros, print_one_macro);
}
-\f
/* Initializing the `macrocmd' module. */
-extern initialize_file_ftype _initialize_macrocmd; /* -Wmissing-prototypes */
-
void
_initialize_macrocmd (void)
{
¯olist);
add_alias_cmd ("exp1", "expand-once", no_class, 1, ¯olist);
- add_cmd ("macro", no_class, info_macro_command,
- _("Show the definition of MACRO, and it's source location.\n\
+ add_info ("macro", info_macro_command,
+ _("Show the definition of MACRO, and it's source location.\n\
Usage: info macro [-a|-all] [--] MACRO\n\
Options: \n\
-a, --all Output all definitions of MACRO in the current compilation\
unit.\n\
- -- Specify the end of arguments and the beginning of the MACRO."),
-
- &infolist);
+ -- Specify the end of arguments and the beginning of the MACRO."));
- add_cmd ("macros", no_class, info_macros_command,
- _("Show the definitions of all macros at LINESPEC, or the current \
+ add_info ("macros", info_macros_command,
+ _("Show the definitions of all macros at LINESPEC, or the current \
source location.\n\
-Usage: info macros [LINESPEC]"),
- &infolist);
+Usage: info macros [LINESPEC]"));
add_cmd ("define", no_class, macro_define_command, _("\
Define a new C/C++ preprocessor macro.\n\
projects / deliverable / binutils-gdb.git / blobdiff