projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[gdb/testsuite] Add PR number in KFAIL in gdb.ada/array_ptr_renaming.exp
[deliverable/binutils-gdb.git]
/
gdb
/
m2-typeprint.c
diff --git
a/gdb/m2-typeprint.c
b/gdb/m2-typeprint.c
index 4cf15698fe3dff4ed224b9c40b6dbbf6f8b83acd..a4a7689c33eeda556b06301de908da75645a6fec 100644
(file)
--- a/
gdb/m2-typeprint.c
+++ b/
gdb/m2-typeprint.c
@@
-1,5
+1,5
@@
/* Support for printing Modula 2 types for GDB, the GNU debugger.
/* Support for printing Modula 2 types for GDB, the GNU debugger.
- Copyright (C) 1986-20
17
Free Software Foundation, Inc.
+ Copyright (C) 1986-20
20
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-31,6
+31,7
@@
#include "c-lang.h"
#include "typeprint.h"
#include "cp-abi.h"
#include "c-lang.h"
#include "typeprint.h"
#include "cp-abi.h"
+#include "cli/cli-style.h"
static void m2_print_bounds (struct type *type,
struct ui_file *stream, int show, int level,
static void m2_print_bounds (struct type *type,
struct ui_file *stream, int show, int level,
@@
-81,7
+82,7
@@
m2_print_type (struct type *type, const char *varstring,
wrap_here (" ");
if (type == NULL)
{
wrap_here (" ");
if (type == NULL)
{
- fputs_
filtered (_("<type unknown>"
), stream);
+ fputs_
styled (_("<type unknown>"), metadata_style.style (
), stream);
return;
}
return;
}
@@
-164,12
+165,12
@@
m2_print_typedef (struct type *type, struct symbol *new_symbol,
fprintf_filtered (stream, "TYPE ");
if (!TYPE_NAME (SYMBOL_TYPE (new_symbol))
|| strcmp (TYPE_NAME ((SYMBOL_TYPE (new_symbol))),
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
));
+
new_symbol->linkage_name (
)) != 0)
+ fprintf_filtered (stream, "%s = ",
new_symbol->print_name (
));
else
fprintf_filtered (stream, "<builtin> = ");
type_print (type, "", stream, 0);
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. */
}
/* m2_type_name - if a, type, has a name then print it. */
@@
-234,9
+235,9
@@
static void m2_array (struct type *type, struct ui_file *stream,
m2_print_bounds (TYPE_INDEX_TYPE (type), stream, show, -1, 1);
}
else
m2_print_bounds (TYPE_INDEX_TYPE (type), stream, show, -1, 1);
}
else
- fp
rintf_filtered (stream, "%d",
- (TYPE_LENGTH (type)
-
/ TYPE_LENGTH (TYPE_TARGET_TYPE (type)))
);
+ fp
uts_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, "] OF ");
m2_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level, flags);
@@
-280,7
+281,8
@@
m2_procedure (struct type *type, struct ui_file *stream,
{
fprintf_filtered (stream, "PROCEDURE ");
m2_type_name (type, stream);
{
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_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
{
int i, len = TYPE_NFIELDS (type);
{
int i, len = TYPE_NFIELDS (type);
@@
-294,11
+296,11
@@
m2_procedure (struct type *type, struct ui_file *stream,
}
m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags);
}
}
m2_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0, flags);
}
+ fprintf_filtered (stream, ") : ");
if (TYPE_TARGET_TYPE (type) != NULL)
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);
}
}
}
}
@@
-438,22
+440,14
@@
m2_long_set (struct type *type, struct ui_file *stream, int show, int level,
if (m2_is_long_set (type))
{
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 (type) != NULL)
{
fputs_filtered (TYPE_NAME (type), stream);
if (show == 0)
return 1;
{
fputs_filtered (TYPE_NAME (type), 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 ");
if (get_long_set_bounds (type, &low, &high))
{
fprintf_filtered(stream, "SET OF ");
@@
-536,11
+530,11
@@
m2_record_fields (struct type *type, struct ui_file *stream, int show,
int level, const struct type_print_options *flags)
{
/* Print the tag if it exists. */
int level, const struct type_print_options *flags)
{
/* Print the tag if it exists. */
- if (TYPE_
TAG_
NAME (type) != NULL)
+ if (TYPE_NAME (type) != NULL)
{
{
- if (!startswith (TYPE_
TAG_
NAME (type), "$$"))
+ if (!startswith (TYPE_NAME (type), "$$"))
{
{
- fputs_filtered (TYPE_
TAG_
NAME (type), stream);
+ fputs_filtered (TYPE_NAME (type), stream);
if (show > 0)
fprintf_filtered (stream, " = ");
}
if (show > 0)
fprintf_filtered (stream, " = ");
}
@@
-569,7
+563,8
@@
m2_record_fields (struct type *type, struct ui_file *stream, int show,
QUIT;
print_spaces_filtered (level + 4, stream);
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),
"",
fputs_filtered (" : ", stream);
m2_print_type (TYPE_FIELD_TYPE (type, i),
"",
@@
-600,10
+595,10
@@
m2_enum (struct type *type, struct ui_file *stream, int show, int level)
if (show < 0)
{
/* If we just printed a tag name, no need to print anything else. */
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 (type) == NULL)
fprintf_filtered (stream, "(...)");
}
fprintf_filtered (stream, "(...)");
}
- else if (show > 0 || TYPE_
TAG_
NAME (type) == NULL)
+ else if (show > 0 || TYPE_NAME (type) == NULL)
{
fprintf_filtered (stream, "(");
len = TYPE_NFIELDS (type);
{
fprintf_filtered (stream, "(");
len = TYPE_NFIELDS (type);
@@
-614,7
+609,8
@@
m2_enum (struct type *type, struct ui_file *stream, int show, int level)
if (i > 0)
fprintf_filtered (stream, ", ");
wrap_here (" ");
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",
if (lastval != TYPE_FIELD_ENUMVAL (type, i))
{
fprintf_filtered (stream, " = %s",
This page took
0.026666 seconds
and
4
git commands to generate.