/* Support for printing Ada types for GDB, the GNU debugger.
- Copyright (C) 1986, 1988, 1989, 1991, 1997, 1998, 1999, 2000, 2001, 2002,
- 2003, 2004, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 1986-2014 Free Software Foundation, Inc.
This file is part of GDB.
#include "ada-lang.h"
#include <ctype.h>
-#include "gdb_string.h"
+#include <string.h>
#include <errno.h>
static int print_selected_record_field_types (struct type *, struct type *,
int, int,
- struct ui_file *, int, int);
+ struct ui_file *, int, int,
+ const struct type_print_options *);
static int print_record_field_types (struct type *, struct type *,
- struct ui_file *, int, int);
+ struct ui_file *, int, int,
+ const struct type_print_options *);
-static void print_array_type (struct type *, struct ui_file *, int, int);
+static void print_array_type (struct type *, struct ui_file *, int, int,
+ const struct type_print_options *);
static int print_choices (struct type *, int, struct ui_file *,
struct type *);
return NULL;
else
{
- char *raw_name = ada_type_name (type);
+ const char *raw_name = ada_type_name (type);
char *s, *q;
if (name_buffer == NULL || name_buffer_len <= strlen (raw_name))
static void
print_range_type (struct type *raw_type, struct ui_file *stream)
{
- char *name;
+ const char *name;
struct type *base_type;
- char *subtype_info;
+ const char *subtype_info;
gdb_assert (raw_type != NULL);
name = TYPE_NAME (raw_type);
print_enum_type (struct type *type, struct ui_file *stream)
{
int len = TYPE_NFIELDS (type);
- int i, lastval;
+ int i;
+ LONGEST lastval;
fprintf_filtered (stream, "(");
wrap_here (" ");
fprintf_filtered (stream, ", ");
wrap_here (" ");
fputs_filtered (ada_enum_name (TYPE_FIELD_NAME (type, i)), stream);
- if (lastval != TYPE_FIELD_BITPOS (type, i))
+ if (lastval != TYPE_FIELD_ENUMVAL (type, i))
{
- fprintf_filtered (stream, " => %d", TYPE_FIELD_BITPOS (type, i));
- lastval = TYPE_FIELD_BITPOS (type, i);
+ fprintf_filtered (stream, " => %s",
+ plongest (TYPE_FIELD_ENUMVAL (type, i)));
+ lastval = TYPE_FIELD_ENUMVAL (type, i);
}
lastval += 1;
}
static void
print_array_type (struct type *type, struct ui_file *stream, int show,
- int level)
+ int level, const struct type_print_options *flags)
{
int bitsize;
int n_indices;
fprintf_filtered (stream, ") of ");
wrap_here ("");
ada_print_type (ada_array_element_type (type, n_indices), "", stream,
- show == 0 ? 0 : show - 1, level + 1);
+ show == 0 ? 0 : show - 1, level + 1, flags);
if (bitsize > 0)
fprintf_filtered (stream, " <packed: %d-bit elements>", bitsize);
}
static void
print_variant_clauses (struct type *type, int field_num,
struct type *outer_type, struct ui_file *stream,
- int show, int level)
+ int show, int level,
+ const struct type_print_options *flags)
{
int i;
struct type *var_type, *par_type;
if (print_choices (var_type, i, stream, discr_type))
{
if (print_record_field_types (TYPE_FIELD_TYPE (var_type, i),
- outer_type, stream, show, level + 4)
+ outer_type, stream, show, level + 4,
+ flags)
<= 0)
fprintf_filtered (stream, " null;");
}
else
print_selected_record_field_types (var_type, outer_type, i, i,
- stream, show, level + 4);
+ stream, show, level + 4, flags);
}
}
static void
print_variant_part (struct type *type, int field_num, struct type *outer_type,
- struct ui_file *stream, int show, int level)
+ struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags)
{
fprintf_filtered (stream, "\n%*scase %s is", level + 4, "",
ada_variant_discrim_name
(TYPE_FIELD_TYPE (type, field_num)));
print_variant_clauses (type, field_num, outer_type, stream, show,
- level + 4);
+ level + 4, flags);
fprintf_filtered (stream, "\n%*send case;", level + 4, "");
}
static int
print_selected_record_field_types (struct type *type, struct type *outer_type,
int fld0, int fld1,
- struct ui_file *stream, int show, int level)
+ struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags)
{
int i, flds;
;
else if (ada_is_wrapper_field (type, i))
flds += print_record_field_types (TYPE_FIELD_TYPE (type, i), type,
- stream, show, level);
+ stream, show, level, flags);
else if (ada_is_variant_part (type, i))
{
- print_variant_part (type, i, outer_type, stream, show, level);
+ print_variant_part (type, i, outer_type, stream, show, level, flags);
flds = 1;
}
else
fprintf_filtered (stream, "\n%*s", level + 4, "");
ada_print_type (TYPE_FIELD_TYPE (type, i),
TYPE_FIELD_NAME (type, i),
- stream, show - 1, level + 4);
+ stream, show - 1, level + 4, flags);
fprintf_filtered (stream, ";");
}
}
static int
print_record_field_types (struct type *type, struct type *outer_type,
- struct ui_file *stream, int show, int level)
+ struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags)
{
return print_selected_record_field_types (type, outer_type,
0, TYPE_NFIELDS (type) - 1,
- stream, show, level);
+ stream, show, level, flags);
}
static void
print_record_type (struct type *type0, struct ui_file *stream, int show,
- int level)
+ int level, const struct type_print_options *flags)
{
struct type *parent_type;
struct type *type;
flds = 0;
if (parent_type != NULL && ada_type_name (parent_type) == NULL)
flds += print_record_field_types (parent_type, parent_type,
- stream, show, level);
- flds += print_record_field_types (type, type, stream, show, level);
+ stream, show, level, flags);
+ flds += print_record_field_types (type, type, stream, show, level,
+ flags);
if (flds > 0)
fprintf_filtered (stream, "\n%*send record", level, "");
number of levels of internal structure to show (see ada_print_type). */
static void
print_unchecked_union_type (struct type *type, struct ui_file *stream,
- int show, int level)
+ int show, int level,
+ const struct type_print_options *flags)
{
if (show < 0)
fprintf_filtered (stream, "record (?) is ... end record");
level + 12, "");
ada_print_type (TYPE_FIELD_TYPE (type, i),
TYPE_FIELD_NAME (type, i),
- stream, show - 1, level + 12);
+ stream, show - 1, level + 12, flags);
fprintf_filtered (stream, ";");
}
for function or procedure NAME if NAME is not null. */
static void
-print_func_type (struct type *type, struct ui_file *stream, const char *name)
+print_func_type (struct type *type, struct ui_file *stream, const char *name,
+ const struct type_print_options *flags)
{
int i, len = TYPE_NFIELDS (type);
wrap_here (" ");
}
fprintf_filtered (stream, "a%d: ", i + 1);
- ada_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0);
+ ada_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0,
+ flags);
}
fprintf_filtered (stream, ")");
}
if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
{
fprintf_filtered (stream, " return ");
- ada_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0);
+ ada_print_type (TYPE_TARGET_TYPE (type), "", stream, 0, 0, flags);
}
}
void
ada_print_type (struct type *type0, const char *varstring,
- struct ui_file *stream, int show, int level)
+ struct ui_file *stream, int show, int level,
+ const struct type_print_options *flags)
{
struct type *type = ada_check_typedef (ada_get_base_type (type0));
char *type_name = decoded_type_name (type0);
}
if (ada_is_aligner_type (type))
- ada_print_type (ada_aligned_type (type), "", stream, show, level);
+ ada_print_type (ada_aligned_type (type), "", stream, show, level, flags);
else if (ada_is_constrained_packed_array_type (type)
&& TYPE_CODE (type) != TYPE_CODE_PTR)
- print_array_type (type, stream, show, level);
+ print_array_type (type, stream, show, level, flags);
else
switch (TYPE_CODE (type))
{
default:
fprintf_filtered (stream, "<");
- c_print_type (type, "", stream, show, level);
+ c_print_type (type, "", stream, show, level, flags);
fprintf_filtered (stream, ">");
break;
case TYPE_CODE_PTR:
case TYPE_CODE_TYPEDEF:
fprintf_filtered (stream, "access ");
- ada_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+ ada_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level,
+ flags);
break;
case TYPE_CODE_REF:
fprintf_filtered (stream, "<ref> ");
- ada_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level);
+ ada_print_type (TYPE_TARGET_TYPE (type), "", stream, show, level,
+ flags);
break;
case TYPE_CODE_ARRAY:
- print_array_type (type, stream, show, level);
+ print_array_type (type, stream, show, level, flags);
break;
case TYPE_CODE_BOOL:
fprintf_filtered (stream, "(false, true)");
print_fixed_point_type (type, stream);
else
{
- char *name = ada_type_name (type);
+ const char *name = ada_type_name (type);
if (!ada_is_range_type_name (name))
fprintf_filtered (stream, _("<%d-byte integer>"),
break;
case TYPE_CODE_STRUCT:
if (ada_is_array_descriptor_type (type))
- print_array_type (type, stream, show, level);
+ print_array_type (type, stream, show, level, flags);
else if (ada_is_bogus_array_descriptor (type))
fprintf_filtered (stream,
_("array (?) of ? (<mal-formed descriptor>)"));
else
- print_record_type (type, stream, show, level);
+ print_record_type (type, stream, show, level, flags);
break;
case TYPE_CODE_UNION:
- print_unchecked_union_type (type, stream, show, level);
+ print_unchecked_union_type (type, stream, show, level, flags);
break;
case TYPE_CODE_FUNC:
- print_func_type (type, stream, varstring);
+ print_func_type (type, stream, varstring, flags);
break;
}
}
struct ui_file *stream)
{
type = ada_check_typedef (type);
- ada_print_type (type, "", stream, 0, 0);
+ ada_print_type (type, "", stream, 0, 0, &type_print_raw_options);
fprintf_filtered (stream, "\n");
}