#include "c-lang.h"
#include "charset.h"
#include "cp-support.h"
+#include "demangle.h"
#include "gdbarch.h"
#include "infcall.h"
#include "objfiles.h"
if (strncmp (TYPE_FIELD_NAME (type, 0), RUST_ENUM_PREFIX,
strlen (RUST_ENUM_PREFIX)) == 0)
{
- char *tail;
+ char *name, *tail, *token;
unsigned long fieldno;
struct type *member_type;
LONGEST value;
if (TYPE_NFIELDS (type) != 1)
error (_("Only expected one field in %s type"), RUST_ENUM_PREFIX);
- fieldno = strtoul (TYPE_FIELD_NAME (type, 0) + strlen (RUST_ENUM_PREFIX),
- &tail, 10);
- if (*tail != '$')
- error (_("Invalid form for %s"), RUST_ENUM_PREFIX);
-
+ /* Optimized enums have only one field. */
member_type = TYPE_FIELD_TYPE (type, 0);
- if (fieldno >= TYPE_NFIELDS (member_type))
- error (_("%s refers to field after end of member type"),
- RUST_ENUM_PREFIX);
- embedded_offset += TYPE_FIELD_BITPOS (member_type, fieldno) / 8;
- value = unpack_long (TYPE_FIELD_TYPE (member_type, fieldno),
- valaddr + embedded_offset);
+ name = xstrdup (TYPE_FIELD_NAME (type, 0));
+ cleanup = make_cleanup (xfree, name);
+ tail = name + strlen (RUST_ENUM_PREFIX);
+
+ /* The location of the value that doubles as a discriminant is
+ stored in the name of the field, as
+ RUST$ENCODED$ENUM$<fieldno>$<fieldno>$...$<variantname>
+ where the fieldnos are the indices of the fields that should be
+ traversed in order to find the field (which may be several fields deep)
+ and the variantname is the name of the variant of the case when the
+ field is zero. */
+ while ((token = strsep (&tail, "$")) != NULL)
+ {
+ if (sscanf (token, "%lu", &fieldno) != 1)
+ {
+ /* We have reached the enum name, which cannot start
+ with a digit. */
+ break;
+ }
+ if (fieldno >= TYPE_NFIELDS (member_type))
+ error (_("%s refers to field after end of member type"),
+ RUST_ENUM_PREFIX);
+
+ embedded_offset += TYPE_FIELD_BITPOS (member_type, fieldno) / 8;
+ member_type = TYPE_FIELD_TYPE (member_type, fieldno);
+ }
+
+ if (token >= name + strlen (TYPE_FIELD_NAME (type, 0)))
+ error (_("Invalid form for %s"), RUST_ENUM_PREFIX);
+ value = unpack_long (member_type, valaddr + embedded_offset);
+
if (value == 0)
{
ret.field_no = RUST_ENCODED_ENUM_HIDDEN;
- ret.name = concat (TYPE_NAME (type), "::", tail + 1, (char *) NULL);
+ ret.name = concat (TYPE_NAME (type), "::", token, (char *) NULL);
}
else
{
ret.field_no = RUST_ENCODED_ENUM_REAL;
ret.name = concat (TYPE_NAME (type), "::",
- rust_last_path_segment (TYPE_NAME (member_type)),
+ rust_last_path_segment (TYPE_NAME (TYPE_FIELD_TYPE (type, 0))),
(char *) NULL);
}
+ do_cleanups (cleanup);
return ret;
}
" * I",
"true",
"false",
- "void",
+ "()",
"[",
"]"
};
if (show <= 0
&& TYPE_NAME (type) != NULL)
{
- fputs_filtered (TYPE_NAME (type), stream);
+ /* Rust calls the unit type "void" in its debuginfo,
+ but we don't want to print it as that. */
+ if (TYPE_CODE (type) == TYPE_CODE_VOID)
+ fputs_filtered ("()", stream);
+ else
+ fputs_filtered (TYPE_NAME (type), stream);
return;
}
type = check_typedef (type);
switch (TYPE_CODE (type))
{
+ case TYPE_CODE_VOID:
+ fputs_filtered ("()", stream);
+ break;
+
case TYPE_CODE_FUNC:
/* Delegate varargs to the C printer. */
if (TYPE_VARARGS (type))
rust_print_type (TYPE_FIELD_TYPE (type, i), "", stream, -1, 0,
flags);
}
- fputs_filtered (") -> ", stream);
- rust_print_type (TYPE_TARGET_TYPE (type), "", stream, -1, 0, flags);
+ fputs_filtered (")", stream);
+ /* If it returns unit, we can omit the return type. */
+ if (TYPE_CODE (TYPE_TARGET_TYPE (type)) != TYPE_CODE_VOID)
+ {
+ fputs_filtered (" -> ", stream);
+ rust_print_type (TYPE_TARGET_TYPE (type), "", stream, -1, 0, flags);
+ }
break;
case TYPE_CODE_ARRAY:
case TYPE_CODE_UNION:
{
- /* ADT enums */
+ /* ADT enums. */
int i, len = 0;
+ /* Skip the discriminant field. */
+ int skip_to = 1;
fputs_filtered ("enum ", stream);
if (TYPE_TAG_NAME (type) != NULL)
fputs_filtered (" ", stream);
len = strlen (TYPE_TAG_NAME (type));
}
- fputs_filtered ("{\n", stream);
+ fputs_filtered ("{\n", stream);
+
+ if (strncmp (TYPE_FIELD_NAME (type, 0), RUST_ENUM_PREFIX,
+ strlen (RUST_ENUM_PREFIX)) == 0)
+ {
+ const char *zero_field = strrchr (TYPE_FIELD_NAME (type, 0), '$');
+ if (zero_field != NULL && strlen (zero_field) > 1)
+ {
+ fprintfi_filtered (level + 2, stream, "%s,\n", zero_field + 1);
+ /* There is no explicit discriminant field, skip nothing. */
+ skip_to = 0;
+ }
+ }
for (i = 0; i < TYPE_NFIELDS (type); ++i)
{
fprintfi_filtered (level + 2, stream, "%s", name);
- if (TYPE_NFIELDS (variant_type) > 1)
+ if (TYPE_NFIELDS (variant_type) > skip_to)
{
int first = 1;
int is_tuple = rust_tuple_variant_type_p (variant_type);
int j;
fputs_filtered (is_tuple ? "(" : "{", stream);
- for (j = 1; j < TYPE_NFIELDS (variant_type); j++)
+ for (j = skip_to; j < TYPE_NFIELDS (variant_type); j++)
{
if (first)
first = 0;
\f
+/* la_sniff_from_mangled_name for Rust. */
+
+static int
+rust_sniff_from_mangled_name (const char *mangled, char **demangled)
+{
+ *demangled = gdb_demangle (mangled, DMGL_PARAMS | DMGL_ANSI);
+ return *demangled != NULL;
+}
+
+\f
+
static const struct exp_descriptor exp_descriptor_rust =
{
rust_print_subexp,
rust_lookup_symbol_nonlocal, /* lookup_symbol_nonlocal */
basic_lookup_transparent_type,/* lookup_transparent_type */
gdb_demangle, /* Language specific symbol demangler */
+ rust_sniff_from_mangled_name,
NULL, /* Language specific
class_name_from_physname */
c_op_print_tab, /* expression operators for printing */
projects / deliverable / binutils-gdb.git / blobdiff