Rename demangle.c to gdb-demangle.c, and some cleanup

In addition to renaming demangle.c to match the header file naming,
this also makes is_cplus_marker return a bool and removes a duplicate
declaration of "bool demangle" from symtab.h.

gdb/ChangeLog:

2019-11-21  Christian Biesinger  <cbiesinger@google.com>

	* Makefile.in: Update.
	* demangle.c: Rename to...
	* gdb-demangle.c: ..this.
	(is_cplus_marker): Change return type to bool.
	(_initialize_demangler): Rename to...
	(_initialize_gdb_demangle): ...this.
	* gdb-demangle.h (is_cplus_marker): Change return type to bool.
	* symtab.h (demangle): Remove declaration; instead include
	gdb-demangle.h.

Change-Id: I83c3b3f7ee71b2bf6f5b5d0f9eb1d4b5208f2a97
This commit is contained in:
Christian Biesinger 2019-11-21 13:02:07 -06:00
parent 6ba1852136
commit f10ffa4146
5 changed files with 17 additions and 5 deletions

View File

@ -1,3 +1,15 @@
2019-11-21 Christian Biesinger <cbiesinger@google.com>
* Makefile.in: Update.
* demangle.c: Rename to...
* gdb-demangle.c: ..this.
(is_cplus_marker): Change return type to bool.
(_initialize_demangler): Rename to...
(_initialize_gdb_demangle): ...this.
* gdb-demangle.h (is_cplus_marker): Change return type to bool.
* symtab.h (demangle): Remove declaration; instead include
gdb-demangle.h.
2019-11-21 Tom Tromey <tromey@adacore.com>
* gdbsupport/format.c (format_pieces): Parse %I64d.

View File

@ -1009,7 +1009,6 @@ COMMON_SFILES = \
dbxread.c \
dcache.c \
debug.c \
demangle.c \
dictionary.c \
disasm.c \
disasm-selftests.c \
@ -1040,6 +1039,7 @@ COMMON_SFILES = \
frame-base.c \
frame-unwind.c \
gcore.c \
gdb-demangle.c \
gdb_bfd.c \
gdb_obstack.c \
gdb_regex.c \

View File

@ -149,7 +149,7 @@ static char cplus_markers[] = {'$', '.', '\0'};
/* See documentation in gdb-demangle.h. */
int
bool
is_cplus_marker (int c)
{
return c && strchr (cplus_markers, c) != NULL;
@ -213,7 +213,7 @@ demangle_command (const char *args, int from_tty)
}
void
_initialize_demangler (void)
_initialize_gdb_demangle (void)
{
int i, ndems;

View File

@ -29,6 +29,6 @@ extern bool demangle;
extern bool asm_demangle;
/* Check if a character is one of the commonly used C++ marker characters. */
extern int is_cplus_marker (int);
extern bool is_cplus_marker (int);
#endif /* GDB_DEMANGLE_H */

View File

@ -33,6 +33,7 @@
#include "gdbsupport/gdb_string_view.h"
#include "gdbsupport/next-iterator.h"
#include "completer.h"
#include "gdb-demangle.h"
/* Opaque declarations. */
struct ui_file;
@ -553,7 +554,6 @@ extern const char *symbol_demangled_name
#define SYMBOL_PRINT_NAME(symbol) \
(demangle ? SYMBOL_NATURAL_NAME (symbol) : SYMBOL_LINKAGE_NAME (symbol))
extern bool demangle;
/* Macro that returns the name to be used when sorting and searching symbols.
In C++, we search for the demangled form of a name,