[RFA 1/3] Use function_name_style to print Ada and C function names

Philippe Waroquiers
2019-01-10T22:01:26Z

gdb/ChangeLog
2019-01-10 Philippe Waroquiers <philippe.waroquiers@skynet.be>

* ada-typeprint.c (print_func_type): Print function name
style to print function name.
* c-typeprint.c (c_print_type_1): Likewise.
---
gdb/ada-typeprint.c | 6 +++++-
gdb/c-typeprint.c | 8 ++++++--
2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/gdb/ada-typeprint.c b/gdb/ada-typeprint.c
index 2b6cdaf264..8c42e8140d 100644
--- a/gdb/ada-typeprint.c
+++ b/gdb/ada-typeprint.c
@@ -30,6 +30,7 @@
#include "language.h"
#include "demangle.h"
#include "c-lang.h"
+#include "cli/cli-style.h"
#include "typeprint.h"
#include "target-float.h"
#include "ada-lang.h"
@@ -779,7 +780,10 @@ print_func_type (struct type *type, struct ui_file *stream, const char *name,
fprintf_filtered (stream, "function");

if (name != NULL && name[0] != '\0')
- fprintf_filtered (stream, " %s", name);
+ {
+ fputs_filtered (" ", stream);
+ fputs_styled (name, function_name_style.style (), stream);
+ }

if (len > 0)
{
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 5e7e672e02..0d2d9b5106 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -28,6 +28,7 @@
#include "language.h"
#include "demangle.h"
#include "c-lang.h"
+#include "cli/cli-style.h"
#include "typeprint.h"
#include "cp-abi.h"
#include "cp-support.h"
@@ -115,6 +116,7 @@ c_print_type_1 (struct type *type,
type = check_typedef (type);

local_name = typedef_hash_table::find_typedef (flags, type);
+ code = TYPE_CODE (type);
if (local_name != NULL)
{
fputs_filtered (local_name, stream);
@@ -124,7 +126,6 @@ c_print_type_1 (struct type *type,
else
{
c_type_print_base_1 (type, stream, show, level, language, flags, podata);
- code = TYPE_CODE (type);
if ((varstring != NULL && *varstring != '\0')
/* Need a space if going to print stars or brackets;
but not if we will print just a type name. */
@@ -144,7 +145,10 @@ c_print_type_1 (struct type *type,

if (varstring != NULL)
{
- fputs_filtered (varstring, stream);
+ if (code == TYPE_CODE_FUNC || code == TYPE_CODE_METHOD)
+ fputs_styled (varstring, function_name_style.style (), stream );
+ else
+ fputs_filtered (varstring, stream);

/* For demangled function names, we have the arglist as part of
the name, so don't print an additional pair of ()'s. */
--
2.20.1