/* Support for printing C and C++ types for GDB, the GNU debugger.
- Copyright (C) 1986-2018 Free Software Foundation, Inc.
+ Copyright (C) 1986-2020 Free Software Foundation, Inc.
This file is part of GDB.
#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"
-/* When printing the offsets of a struct and its fields (i.e., 'ptype
- /o'; type_print_options::print_offsets), we use this many
- characters when printing the offset information at the beginning of
- the line. This is needed in order to generate the correct amount
- of whitespaces when no offset info should be printed for a certain
- field. */
-#define OFFSET_SPC_LEN 23
-
/* A list of access specifiers used for printing. */
enum access_specifier
/* Print "const", "volatile", or address space modifiers. */
static void c_type_print_modifier (struct type *,
struct ui_file *,
- int, int);
+ int, int, enum language);
static void c_type_print_base_1 (struct type *type, struct ui_file *stream,
int show, int level, enum language language,
const struct type_print_options *flags,
struct ui_file *stream)
{
- std::string s;
+ gdb::unique_xmalloc_ptr<char> s;
if (!flags->raw)
s = cp_canonicalize_string_full (name,
find_typedef_for_canonicalize,
(void *) flags);
- fputs_filtered (!s.empty () ? s.c_str () : name, stream);
+ fputs_filtered (s != nullptr ? s.get () : name, stream);
}
\f
type = check_typedef (type);
local_name = typedef_hash_table::find_typedef (flags, type);
+ code = type->code ();
if (local_name != NULL)
{
fputs_filtered (local_name, stream);
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. */
- || ((show > 0 || TYPE_NAME (type) == 0)
+ || ((show > 0 || type->name () == 0)
&& (code == TYPE_CODE_PTR || code == TYPE_CODE_FUNC
|| code == TYPE_CODE_METHOD
|| (code == TYPE_CODE_ARRAY
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_styled (varstring, variable_name_style.style (), stream);
/* For demangled function names, we have the arglist as part of
the name, so don't print an additional pair of ()'s. */
{
type = check_typedef (type);
fprintf_filtered (stream, "typedef ");
- type_print (type, "", stream, 0);
- if (TYPE_NAME ((SYMBOL_TYPE (new_symbol))) == 0
- || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
- SYMBOL_LINKAGE_NAME (new_symbol)) != 0
- || TYPE_CODE (SYMBOL_TYPE (new_symbol)) == TYPE_CODE_TYPEDEF)
- fprintf_filtered (stream, " %s", SYMBOL_PRINT_NAME (new_symbol));
- fprintf_filtered (stream, ";\n");
+ type_print (type, "", stream, -1);
+ if ((SYMBOL_TYPE (new_symbol))->name () == 0
+ || strcmp ((SYMBOL_TYPE (new_symbol))->name (),
+ new_symbol->linkage_name ()) != 0
+ || SYMBOL_TYPE (new_symbol)->code () == TYPE_CODE_TYPEDEF)
+ fprintf_filtered (stream, " %s", new_symbol->print_name ());
+ fprintf_filtered (stream, ";");
}
/* If TYPE is a derived type, then print out derivation information.
? "public" : (TYPE_FIELD_PROTECTED (type, i)
? "protected" : "private"),
BASETYPE_VIA_VIRTUAL (type, i) ? " virtual" : "");
- name = TYPE_NAME (TYPE_BASECLASS (type, i));
+ name = TYPE_BASECLASS (type, i)->name ();
if (name)
print_name_maybe_canonical (name, flags, stream);
else
enum language language,
const struct type_print_options *flags)
{
- struct field *args = TYPE_FIELDS (mtype);
- int nargs = TYPE_NFIELDS (mtype);
+ struct field *args = mtype->fields ();
+ int nargs = mtype->num_fields ();
int varargs = TYPE_VARARGS (mtype);
int i;
struct type *domain;
gdb_assert (nargs > 0);
- gdb_assert (TYPE_CODE (args[0].type) == TYPE_CODE_PTR);
+ gdb_assert (args[0].type->code () == TYPE_CODE_PTR);
domain = TYPE_TARGET_TYPE (args[0].type);
if (TYPE_CONST (domain))
fprintf_filtered (stream, " volatile");
if (TYPE_RESTRICT (domain))
- fprintf_filtered (stream, " restrict");
+ fprintf_filtered (stream, (language == language_cplus
+ ? " __restrict__"
+ : " restrict"));
if (TYPE_ATOMIC (domain))
fprintf_filtered (stream, " _Atomic");
if (type == 0)
return;
- if (TYPE_NAME (type) && show <= 0)
+ if (type->name () && show <= 0)
return;
QUIT;
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_PTR:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
stream, show, 1, 1, language, flags,
podata);
fprintf_filtered (stream, "*");
- c_type_print_modifier (type, stream, 1, need_post_space);
+ c_type_print_modifier (type, stream, 1, need_post_space, language);
break;
case TYPE_CODE_MEMBERPTR:
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
stream, show, 0, 0, language, flags, podata);
- name = TYPE_NAME (TYPE_SELF_TYPE (type));
+ name = TYPE_SELF_TYPE (type)->name ();
if (name)
print_name_maybe_canonical (name, flags, stream);
else
stream, show, 0, 0, language, flags,
podata);
fprintf_filtered (stream, "(");
- name = TYPE_NAME (TYPE_SELF_TYPE (type));
+ name = TYPE_SELF_TYPE (type)->name ();
if (name)
print_name_maybe_canonical (name, flags, stream);
else
c_type_print_varspec_prefix (TYPE_TARGET_TYPE (type),
stream, show, 1, 0, language, flags,
podata);
- fprintf_filtered (stream, TYPE_CODE(type) == TYPE_CODE_REF ? "&" : "&&");
- c_type_print_modifier (type, stream, 1, need_post_space);
+ fprintf_filtered (stream, type->code () == TYPE_CODE_REF ? "&" : "&&");
+ c_type_print_modifier (type, stream, 1, need_post_space, language);
break;
case TYPE_CODE_METHOD:
static void
c_type_print_modifier (struct type *type, struct ui_file *stream,
- int need_pre_space, int need_post_space)
+ int need_pre_space, int need_post_space,
+ enum language language)
{
int did_print_modifier = 0;
const char *address_space_id;
{
if (did_print_modifier || need_pre_space)
fprintf_filtered (stream, " ");
- fprintf_filtered (stream, "restrict");
+ fprintf_filtered (stream, (language == language_cplus
+ ? "__restrict__"
+ : "restrict"));
did_print_modifier = 1;
}
fprintf_filtered (stream, "(");
- for (i = 0; i < TYPE_NFIELDS (type); i++)
+ for (i = 0; i < type->num_fields (); i++)
{
struct type *param_type;
if (type == 0)
return;
- if (TYPE_NAME (type) && show <= 0)
+ if (type->name () && show <= 0)
return;
QUIT;
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_ARRAY:
{
if (first)
{
wrap_here (" ");
- fprintf_filtered (stream, _("[with %s = "),
- SYMBOL_LINKAGE_NAME (sym));
+ fprintf_filtered (stream, _("[with %s = "), sym->linkage_name ());
first = 0;
}
else
{
fputs_filtered (", ", stream);
wrap_here (" ");
- fprintf_filtered (stream, "%s = ", SYMBOL_LINKAGE_NAME (sym));
+ fprintf_filtered (stream, "%s = ", sym->linkage_name ());
}
c_print_type (SYMBOL_TYPE (sym), "", stream, -1, 0, flags);
if (!flags->print_offsets)
print_spaces_filtered (level, stream);
else
- print_spaces_filtered (level + OFFSET_SPC_LEN, stream);
+ print_spaces_filtered (level + print_offset_data::indentation, stream);
}
/* Output an access specifier to STREAM, if needed. LAST_ACCESS is the
return last_access;
}
-/* Print information about field at index FIELD_IDX of the union type
- TYPE. Since union fields don't have the concept of offsets, we
- just print their sizes.
-
- The output is strongly based on pahole(1). */
-
-static void
-c_print_type_union_field_offset (struct type *type, unsigned int field_idx,
- struct ui_file *stream)
-{
- struct type *ftype = check_typedef (TYPE_FIELD_TYPE (type, field_idx));
-
- fprintf_filtered (stream, "/* %4u */", TYPE_LENGTH (ftype));
-}
-
-/* Helper function for ptype/o implementation that prints information
- about a hole, if necessary. STREAM is where to print. BITPOS is
- the bitpos of the current field. PODATA is the offset-printing
- state. FOR_WHAT is a string describing the purpose of the
- hole. */
-
-static void
-maybe_print_hole (struct ui_file *stream, unsigned int bitpos,
- struct print_offset_data *podata, const char *for_what)
-{
- /* We check for PODATA->END_BITPOS > 0 because there is a specific
- scenario when PODATA->END_BITPOS can be zero and BITPOS can be >
- 0: when we are dealing with a struct/class with a virtual method.
- Because of the vtable, the first field of the struct/class will
- have an offset of sizeof (void *) (the size of the vtable). If
- we do not check for PODATA->END_BITPOS > 0 here, GDB will report
- a hole before the first field, which is not accurate. */
- if (podata->end_bitpos > 0 && podata->end_bitpos < bitpos)
- {
- /* If PODATA->END_BITPOS is smaller than the current type's
- bitpos, it means there's a hole in the struct, so we report
- it here. */
- unsigned int hole = bitpos - podata->end_bitpos;
- unsigned int hole_byte = hole / TARGET_CHAR_BIT;
- unsigned int hole_bit = hole % TARGET_CHAR_BIT;
-
- if (hole_bit > 0)
- fprintf_filtered (stream, "/* XXX %2u-bit %s */\n", hole_bit,
- for_what);
-
- if (hole_byte > 0)
- fprintf_filtered (stream, "/* XXX %2u-byte %s */\n", hole_byte,
- for_what);
- }
-}
-
-/* Print information about field at index FIELD_IDX of the struct type
- TYPE.
-
- PODATA->END_BITPOS is the one-past-the-end bit position of the
- previous field (where we expect this field to be if there is no
- hole). At the end, ENDPOS is updated to the one-past-the-end bit
- position of the current field.
-
- PODATA->OFFSET_BITPOS is the offset value we carry over when we are
- printing a struct that is inside another struct; this is useful so
- that the offset is constantly incremented (if we didn't carry it
- over, the offset would be reset to zero when printing the inner
- struct).
-
- The output is strongly based on pahole(1). */
-
-static void
-c_print_type_struct_field_offset (struct type *type, unsigned int field_idx,
- struct ui_file *stream,
- struct print_offset_data *podata)
-{
- struct type *ftype = check_typedef (TYPE_FIELD_TYPE (type, field_idx));
- unsigned int bitpos = TYPE_FIELD_BITPOS (type, field_idx);
- unsigned int fieldsize_byte = TYPE_LENGTH (ftype);
- unsigned int fieldsize_bit = fieldsize_byte * TARGET_CHAR_BIT;
-
- maybe_print_hole (stream, bitpos, podata, "hole");
-
- if (TYPE_FIELD_PACKED (type, field_idx))
- {
- /* We're dealing with a bitfield. Print how many bits are left
- to be used. */
- unsigned int bitsize = TYPE_FIELD_BITSIZE (type, field_idx);
- /* The bitpos relative to the beginning of our container
- field. */
- unsigned int relative_bitpos;
-
- /* The following was copied from
- value.c:value_primitive_field. */
- if ((bitpos % fieldsize_bit) + bitsize <= fieldsize_bit)
- relative_bitpos = bitpos % fieldsize_bit;
- else
- relative_bitpos = bitpos % TARGET_CHAR_BIT;
-
- /* This is the exact offset (in bits) of this bitfield. */
- unsigned int bit_offset
- = (bitpos - relative_bitpos) + podata->offset_bitpos;
-
- /* The position of the field, relative to the beginning of the
- struct, and how many bits are left to be used in this
- container. */
- fprintf_filtered (stream, "/* %4u:%2u", bit_offset / TARGET_CHAR_BIT,
- fieldsize_bit - (relative_bitpos + bitsize));
- fieldsize_bit = bitsize;
- }
- else
- {
- /* The position of the field, relative to the beginning of the
- struct. */
- fprintf_filtered (stream, "/* %4u",
- (bitpos + podata->offset_bitpos) / TARGET_CHAR_BIT);
-
- fprintf_filtered (stream, " ");
- }
-
- fprintf_filtered (stream, " | %4u */", fieldsize_byte);
-
- podata->end_bitpos = bitpos + fieldsize_bit;
-}
-
/* Return true if an access label (i.e., "public:", "private:",
"protected:") needs to be printed for TYPE. */
if (TYPE_DECLARED_CLASS (type))
{
QUIT;
- for (int i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); i++)
+ for (int i = TYPE_N_BASECLASSES (type); i < type->num_fields (); i++)
if (!TYPE_FIELD_PRIVATE (type, i))
return true;
QUIT;
else
{
QUIT;
- for (int i = TYPE_N_BASECLASSES (type); i < TYPE_NFIELDS (type); i++)
+ for (int i = TYPE_N_BASECLASSES (type); i < type->num_fields (); i++)
if (TYPE_FIELD_PRIVATE (type, i) || TYPE_FIELD_PROTECTED (type, i))
return true;
QUIT;
hash_holder.reset (local_flags.local_typedefs);
}
- c_type_print_modifier (type, stream, 0, 1);
- if (TYPE_CODE (type) == TYPE_CODE_UNION)
+ c_type_print_modifier (type, stream, 0, 1, language);
+ if (type->code () == TYPE_CODE_UNION)
fprintf_filtered (stream, "union ");
else if (TYPE_DECLARED_CLASS (type))
fprintf_filtered (stream, "class ");
spurious "{unnamed struct}"/"{unnamed union}"/"{unnamed
enum}" tag for unnamed struct/union/enum's, which we don't
want to print. */
- if (TYPE_NAME (type) != NULL
- && !startswith (TYPE_NAME (type), "{unnamed"))
+ if (type->name () != NULL
+ && !startswith (type->name (), "{unnamed"))
{
/* When printing the tag name, we are still effectively
printing in the outer context, hence the use of FLAGS
here. */
- print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
+ print_name_maybe_canonical (type->name (), flags, stream);
if (show > 0)
fputs_filtered (" ", stream);
}
{
/* If we just printed a tag name, no need to print anything
else. */
- if (TYPE_NAME (type) == NULL)
+ if (type->name () == NULL)
fprintf_filtered (stream, "{...}");
}
- else if (show > 0 || TYPE_NAME (type) == NULL)
+ else if (show > 0 || type->name () == NULL)
{
struct type *basetype;
int vptr_fieldno;
fprintf_filtered (stream, "{\n");
- if (TYPE_NFIELDS (type) == 0 && TYPE_NFN_FIELDS (type) == 0
+ if (type->num_fields () == 0 && TYPE_NFN_FIELDS (type) == 0
&& TYPE_TYPEDEF_FIELD_COUNT (type) == 0)
{
if (TYPE_STUB (type))
fprintfi_filtered (level + 4, stream,
- _("<incomplete type>\n"));
+ _("%p[<incomplete type>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
else
fprintfi_filtered (level + 4, stream,
- _("<no data fields>\n"));
+ _("%p[<no data fields>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
}
/* Start off with no specific section type, so we can print
/* If there is a base class for this type,
do not print the field that it occupies. */
- int len = TYPE_NFIELDS (type);
+ int len = type->num_fields ();
vptr_fieldno = get_vptr_fieldno (type, &basetype);
struct print_offset_data local_podata;
TYPE_FIELD_PRIVATE (type, i), flags);
}
- bool is_static = field_is_static (&TYPE_FIELD (type, i));
+ bool is_static = field_is_static (&type->field (i));
if (flags->print_offsets)
- {
- if (!is_static)
- {
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
- {
- c_print_type_struct_field_offset
- (type, i, stream, podata);
- }
- else if (TYPE_CODE (type) == TYPE_CODE_UNION)
- c_print_type_union_field_offset (type, i, stream);
- }
- else
- print_spaces_filtered (OFFSET_SPC_LEN, stream);
- }
+ podata->update (type, i, stream);
print_spaces_filtered (level + 4, stream);
if (is_static)
int newshow = show - 1;
- if (flags->print_offsets
- && (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_STRUCT
- || TYPE_CODE (TYPE_FIELD_TYPE (type, i)) == TYPE_CODE_UNION))
+ if (!is_static && flags->print_offsets
+ && (TYPE_FIELD_TYPE (type, i)->code () == TYPE_CODE_STRUCT
+ || TYPE_FIELD_TYPE (type, i)->code () == TYPE_CODE_UNION))
{
/* If we're printing offsets and this field's type is
either a struct or an union, then we're interested in
struct fn_field *f = TYPE_FN_FIELDLIST1 (type, i);
int j, len2 = TYPE_FN_FIELDLIST_LENGTH (type, i);
const char *method_name = TYPE_FN_FIELDLIST_NAME (type, i);
- const char *name = TYPE_NAME (type);
+ const char *name = type->name ();
int is_constructor = name && strcmp (method_name,
name) == 0;
{
/* Keep GDB from crashing here. */
fprintf_filtered (stream,
- _("<undefined type> %s;\n"),
+ _("%p[<undefined type>%p] %s;\n"),
+ metadata_style.style ().ptr (), nullptr,
TYPE_FN_FIELD_PHYSNAME (f, j));
break;
}
&local_flags);
}
else
- fprintf_filtered (stream,
- _("<badly mangled name '%s'>"),
- mangled_name);
+ fprintf_styled (stream, metadata_style.style (),
+ _("<badly mangled name '%s'>"),
+ mangled_name);
}
else
{
if (semi_local_flags.print_nested_type_limit > 0)
--semi_local_flags.print_nested_type_limit;
- if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0)
+ if (type->num_fields () != 0 || TYPE_NFN_FIELDS (type) != 0)
fprintf_filtered (stream, "\n");
for (int i = 0; i < TYPE_NESTED_TYPES_COUNT (type); ++i)
if (TYPE_TYPEDEF_FIELD_COUNT (type) != 0 && flags->print_typedefs)
{
- if (TYPE_NFIELDS (type) != 0 || TYPE_NFN_FIELDS (type) != 0
+ if (type->num_fields () != 0 || TYPE_NFN_FIELDS (type) != 0
|| TYPE_NESTED_TYPES_COUNT (type) != 0)
fprintf_filtered (stream, "\n");
struct type *target = TYPE_TYPEDEF_FIELD_TYPE (type, i);
/* Dereference the typedef declaration itself. */
- gdb_assert (TYPE_CODE (target) == TYPE_CODE_TYPEDEF);
+ gdb_assert (target->code () == TYPE_CODE_TYPEDEF);
target = TYPE_TARGET_TYPE (target);
if (need_access_label)
if (flags->print_offsets)
{
if (show > 0)
- {
- unsigned int bitpos = TYPE_LENGTH (type) * TARGET_CHAR_BIT;
- maybe_print_hole (stream, bitpos, podata, "padding");
-
- fputs_filtered ("\n", stream);
- print_spaces_filtered_with_print_options (level + 4,
- stream,
- flags);
- fprintf_filtered (stream, "/* total size (bytes): %4u */\n",
- TYPE_LENGTH (type));
- }
+ podata->finish (type, level, stream);
- print_spaces_filtered (OFFSET_SPC_LEN, stream);
+ print_spaces_filtered (print_offset_data::indentation, stream);
if (level == 0)
print_spaces_filtered (2, stream);
}
if (type == NULL)
{
- fputs_filtered (_("<type unknown>"), stream);
+ fputs_styled (_("<type unknown>"), metadata_style.style (), stream);
return;
}
always just print the type name directly from the type. */
if (show <= 0
- && TYPE_NAME (type) != NULL)
+ && type->name () != NULL)
{
- c_type_print_modifier (type, stream, 0, 1);
+ c_type_print_modifier (type, stream, 0, 1, language);
/* If we have "typedef struct foo {. . .} bar;" do we want to
print it as "struct foo" or as "bar"? Pick the latter for
way. */
if (language == language_c || language == language_minimal)
{
- if (TYPE_CODE (type) == TYPE_CODE_UNION)
+ if (type->code () == TYPE_CODE_UNION)
fprintf_filtered (stream, "union ");
- else if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ else if (type->code () == TYPE_CODE_STRUCT)
{
if (TYPE_DECLARED_CLASS (type))
fprintf_filtered (stream, "class ");
else
fprintf_filtered (stream, "struct ");
}
- else if (TYPE_CODE (type) == TYPE_CODE_ENUM)
+ else if (type->code () == TYPE_CODE_ENUM)
fprintf_filtered (stream, "enum ");
}
- print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
+ print_name_maybe_canonical (type->name (), flags, stream);
return;
}
type = check_typedef (type);
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_TYPEDEF:
/* If we get here, the typedef doesn't have a name, and we
couldn't resolve TYPE_TARGET_TYPE. Not much we can do. */
- gdb_assert (TYPE_NAME (type) == NULL);
+ gdb_assert (type->name () == NULL);
gdb_assert (TYPE_TARGET_TYPE (type) == NULL);
- fprintf_filtered (stream, _("<unnamed typedef>"));
+ fprintf_styled (stream, metadata_style.style (),
+ _("<unnamed typedef>"));
break;
case TYPE_CODE_FUNC:
break;
case TYPE_CODE_ENUM:
- c_type_print_modifier (type, stream, 0, 1);
+ c_type_print_modifier (type, stream, 0, 1, language);
fprintf_filtered (stream, "enum ");
if (TYPE_DECLARED_CLASS (type))
fprintf_filtered (stream, "class ");
"{unnamed struct}"/"{unnamed union}"/"{unnamed enum}"
tag for unnamed struct/union/enum's, which we don't
want to print. */
- if (TYPE_NAME (type) != NULL
- && !startswith (TYPE_NAME (type), "{unnamed"))
+ if (type->name () != NULL
+ && !startswith (type->name (), "{unnamed"))
{
- print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
+ print_name_maybe_canonical (type->name (), flags, stream);
if (show > 0)
fputs_filtered (" ", stream);
}
{
/* If we just printed a tag name, no need to print anything
else. */
- if (TYPE_NAME (type) == NULL)
+ if (type->name () == NULL)
fprintf_filtered (stream, "{...}");
}
- else if (show > 0 || TYPE_NAME (type) == NULL)
+ else if (show > 0 || type->name () == NULL)
{
LONGEST lastval = 0;
{
struct type *underlying = check_typedef (TYPE_TARGET_TYPE (type));
- if (TYPE_NAME (underlying) != NULL)
- fprintf_filtered (stream, ": %s ", TYPE_NAME (underlying));
+ if (underlying->name () != NULL)
+ fprintf_filtered (stream, ": %s ", underlying->name ());
}
fprintf_filtered (stream, "{");
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
for (i = 0; i < len; i++)
{
QUIT;
if (i)
fprintf_filtered (stream, ", ");
wrap_here (" ");
- fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
+ fputs_styled (TYPE_FIELD_NAME (type, i),
+ variable_name_style.style (), stream);
if (lastval != TYPE_FIELD_ENUMVAL (type, i))
{
fprintf_filtered (stream, " = %s",
local_flags.local_typedefs = NULL;
- c_type_print_modifier (type, stream, 0, 1);
+ c_type_print_modifier (type, stream, 0, 1, language);
fprintf_filtered (stream, "flag ");
- print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
+ print_name_maybe_canonical (type->name (), flags, stream);
if (show > 0)
{
fputs_filtered (" ", stream);
fprintf_filtered (stream, "{\n");
- if (TYPE_NFIELDS (type) == 0)
+ if (type->num_fields () == 0)
{
if (TYPE_STUB (type))
fprintfi_filtered (level + 4, stream,
- _("<incomplete type>\n"));
+ _("%p[<incomplete type>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
else
fprintfi_filtered (level + 4, stream,
- _("<no data fields>\n"));
+ _("%p[<no data fields>%p]\n"),
+ metadata_style.style ().ptr (), nullptr);
}
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
for (i = 0; i < len; i++)
{
QUIT;
case TYPE_CODE_RANGE:
/* This should not occur. */
- fprintf_filtered (stream, _("<range type>"));
+ fprintf_styled (stream, metadata_style.style (), _("<range type>"));
break;
case TYPE_CODE_NAMESPACE:
fputs_filtered ("namespace ", stream);
- fputs_filtered (TYPE_NAME (type), stream);
+ fputs_filtered (type->name (), stream);
break;
default:
as fundamental types. For these, just print whatever the
type name is, as recorded in the type itself. If there is no
type name, then complain. */
- if (TYPE_NAME (type) != NULL)
+ if (type->name () != NULL)
{
- c_type_print_modifier (type, stream, 0, 1);
- print_name_maybe_canonical (TYPE_NAME (type), flags, stream);
+ c_type_print_modifier (type, stream, 0, 1, language);
+ print_name_maybe_canonical (type->name (), flags, stream);
}
else
{
/* At least for dump_symtab, it is important that this not
be an error (). */
- fprintf_filtered (stream, _("<invalid type code %d>"),
- TYPE_CODE (type));
+ fprintf_styled (stream, metadata_style.style (),
+ _("<invalid type code %d>"), type->code ());
}
break;
}
projects / deliverable / binutils-gdb.git / blobdiff