/* Support for printing Modula 2 types for GDB, the GNU debugger.
- Copyright (C) 1986, 1988-1989, 1991-1992, 1995, 2000-2012 Free
- Software Foundation, Inc.
+ Copyright (C) 1986-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "c-lang.h"
#include "typeprint.h"
#include "cp-abi.h"
-
-#include "gdb_string.h"
-#include <errno.h>
+#include "cli/cli-style.h"
static void m2_print_bounds (struct type *type,
struct ui_file *stream, int show, int level,
int show, int level,
const struct type_print_options *flags)
{
- enum type_code code;
-
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
QUIT;
wrap_here (" ");
if (type == NULL)
{
- fputs_filtered (_("<type unknown>"), stream);
+ fputs_styled (_("<type unknown>"), metadata_style.style (), stream);
return;
}
- code = TYPE_CODE (type);
- switch (TYPE_CODE (type))
+ switch (type->code ())
{
case TYPE_CODE_SET:
m2_short_set(type, stream, show, level);
m2_print_typedef (struct type *type, struct symbol *new_symbol,
struct ui_file *stream)
{
- CHECK_TYPEDEF (type);
+ type = check_typedef (type);
fprintf_filtered (stream, "TYPE ");
- if (!TYPE_NAME (SYMBOL_TYPE (new_symbol))
- || strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
- SYMBOL_LINKAGE_NAME (new_symbol)) != 0)
- fprintf_filtered (stream, "%s = ", SYMBOL_PRINT_NAME (new_symbol));
+ if (!SYMBOL_TYPE (new_symbol)->name ()
+ || strcmp ((SYMBOL_TYPE (new_symbol))->name (),
+ new_symbol->linkage_name ()) != 0)
+ fprintf_filtered (stream, "%s = ", new_symbol->print_name ());
else
fprintf_filtered (stream, "<builtin> = ");
type_print (type, "", stream, 0);
- fprintf_filtered (stream, ";\n");
+ fprintf_filtered (stream, ";");
}
/* m2_type_name - if a, type, has a name then print it. */
void
m2_type_name (struct type *type, struct ui_file *stream)
{
- if (TYPE_NAME (type) != NULL)
- fputs_filtered (TYPE_NAME (type), stream);
+ if (type->name () != NULL)
+ fputs_filtered (type->name (), stream);
}
/* m2_range - displays a Modula-2 subrange type. */
int level, const struct type_print_options *flags)
{
if (TYPE_HIGH_BOUND (type) == TYPE_LOW_BOUND (type))
- m2_print_type (TYPE_DOMAIN_TYPE (type), "", stream, show, level,
- flags);
+ {
+ /* FIXME: TYPE_TARGET_TYPE used to be TYPE_DOMAIN_TYPE but that was
+ wrong. Not sure if TYPE_TARGET_TYPE is correct though. */
+ m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level,
+ flags);
+ }
else
{
struct type *target = TYPE_TARGET_TYPE (type);
m2_typedef (struct type *type, struct ui_file *stream, int show,
int level, const struct type_print_options *flags)
{
- if (TYPE_NAME (type) != NULL)
+ if (type->name () != NULL)
{
- fputs_filtered (TYPE_NAME (type), stream);
+ fputs_filtered (type->name (), stream);
fputs_filtered (" = ", stream);
}
m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
m2_print_bounds (TYPE_INDEX_TYPE (type), stream, show, -1, 1);
}
else
- fprintf_filtered (stream, "%d",
- (TYPE_LENGTH (type)
- / TYPE_LENGTH (TYPE_TARGET_TYPE (type))));
+ fputs_filtered (pulongest ((TYPE_LENGTH (type)
+ / TYPE_LENGTH (TYPE_TARGET_TYPE (type)))),
+ stream);
}
fprintf_filtered (stream, "] OF ");
m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
{
fprintf_filtered (stream, "PROCEDURE ");
m2_type_name (type, stream);
- if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
+ if (TYPE_TARGET_TYPE (type) == NULL
+ || TYPE_TARGET_TYPE (type)->code () != TYPE_CODE_VOID)
{
- int i, len = TYPE_NFIELDS (type);
+ int i, len = type->num_fields ();
fprintf_filtered (stream, " (");
for (i = 0; i < len; i++)
}
m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags);
}
+ fprintf_filtered (stream, ") : ");
if (TYPE_TARGET_TYPE (type) != NULL)
- {
- fprintf_filtered (stream, " : ");
- m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);
- }
+ m2_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);
+ else
+ type_print_unknown_return_type (stream);
}
}
{
struct type *target = TYPE_TARGET_TYPE (type);
- if (TYPE_NFIELDS(type) == 0)
+ if (type->num_fields () == 0)
return;
if (print_high)
int len, i;
struct type *range;
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
{
/* check if all fields of the RECORD are consecutive sets. */
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
for (i = TYPE_N_BASECLASSES (type); i < len; i++)
{
if (TYPE_FIELD_TYPE (type, i) == NULL)
return 0;
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, i)) != TYPE_CODE_SET)
+ if (TYPE_FIELD_TYPE (type, i)->code () != TYPE_CODE_SET)
return 0;
if (TYPE_FIELD_NAME (type, i) != NULL
&& (strcmp (TYPE_FIELD_NAME (type, i), "") != 0))
static int
m2_get_discrete_bounds (struct type *type, LONGEST *lowp, LONGEST *highp)
{
- CHECK_TYPEDEF (type);
- switch (TYPE_CODE (type))
+ type = check_typedef (type);
+ switch (type->code ())
{
case TYPE_CODE_CHAR:
if (TYPE_LENGTH (type) < sizeof (LONGEST))
LONGEST l1, l2;
LONGEST h1, h2;
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
{
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
i = TYPE_N_BASECLASSES (type);
if (len == 0)
return 0;
{
struct type *of_type;
int i;
- int len = TYPE_NFIELDS (type);
+ int len = type->num_fields ();
LONGEST low;
LONGEST high;
if (m2_is_long_set (type))
{
- if (TYPE_TAG_NAME (type) != NULL)
- {
- fputs_filtered (TYPE_TAG_NAME (type), stream);
- if (show == 0)
- return 1;
- }
- else if (TYPE_NAME (type) != NULL)
+ if (type->name () != NULL)
{
- fputs_filtered (TYPE_NAME (type), stream);
+ fputs_filtered (type->name (), stream);
if (show == 0)
return 1;
+ fputs_filtered (" = ", stream);
}
- if (TYPE_TAG_NAME (type) != NULL || TYPE_NAME (type) != NULL)
- fputs_filtered (" = ", stream);
-
if (get_long_set_bounds (type, &low, &high))
{
fprintf_filtered(stream, "SET OF ");
int
m2_is_unbounded_array (struct type *type)
{
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
{
/*
* check if we have a structure with exactly two fields named
* type of _m2_contents is a pointer. The TYPE_TARGET_TYPE
* of the pointer determines the unbounded ARRAY OF type.
*/
- if (TYPE_NFIELDS (type) != 2)
+ if (type->num_fields () != 2)
return 0;
if (strcmp (TYPE_FIELD_NAME (type, 0), "_m2_contents") != 0)
return 0;
if (strcmp (TYPE_FIELD_NAME (type, 1), "_m2_high") != 0)
return 0;
- if (TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) != TYPE_CODE_PTR)
+ if (TYPE_FIELD_TYPE (type, 0)->code () != TYPE_CODE_PTR)
return 0;
return 1;
}
int level, const struct type_print_options *flags)
{
/* Print the tag if it exists. */
- if (TYPE_TAG_NAME (type) != NULL)
+ if (type->name () != NULL)
{
- if (strncmp (TYPE_TAG_NAME (type), "$$", 2) != 0)
+ if (!startswith (type->name (), "$$"))
{
- fputs_filtered (TYPE_TAG_NAME (type), stream);
+ fputs_filtered (type->name (), stream);
if (show > 0)
fprintf_filtered (stream, " = ");
}
wrap_here (" ");
if (show < 0)
{
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
fprintf_filtered (stream, "RECORD ... END ");
- else if (TYPE_CODE (type) == TYPE_CODE_UNION)
+ else if (type->code () == TYPE_CODE_UNION)
fprintf_filtered (stream, "CASE ... END ");
}
else if (show > 0)
{
int i;
- int len = TYPE_NFIELDS (type);
+ int len = type->num_fields ();
- if (TYPE_CODE (type) == TYPE_CODE_STRUCT)
+ if (type->code () == TYPE_CODE_STRUCT)
fprintf_filtered (stream, "RECORD\n");
- else if (TYPE_CODE (type) == TYPE_CODE_UNION)
+ else if (type->code () == TYPE_CODE_UNION)
/* i18n: Do not translate "CASE" and "OF". */
fprintf_filtered (stream, _("CASE <variant> OF\n"));
QUIT;
print_spaces_filtered (level + 4, stream);
- fputs_filtered (TYPE_FIELD_NAME (type, i), stream);
+ fputs_styled (TYPE_FIELD_NAME (type, i),
+ variable_name_style.style (), stream);
fputs_filtered (" : ", stream);
m2_print_type (TYPE_FIELD_TYPE (type, i),
"",
if (show < 0)
{
/* If we just printed a tag name, no need to print anything else. */
- if (TYPE_TAG_NAME (type) == NULL)
+ if (type->name () == NULL)
fprintf_filtered (stream, "(...)");
}
- else if (show > 0 || TYPE_TAG_NAME (type) == NULL)
+ else if (show > 0 || type->name () == NULL)
{
fprintf_filtered (stream, "(");
- len = TYPE_NFIELDS (type);
+ len = type->num_fields ();
lastval = 0;
for (i = 0; i < len; i++)
{
if (i > 0)
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",