Convert D printing to value-based API

As with Rust and Go, it was straightforward to convert D to the
value-based API directly.

gdb/ChangeLog
2020-03-13  Tom Tromey  <tom@tromey.com>

	* d-valprint.c (dynamic_array_type): Call d_value_print_inner.
	(d_value_print_inner): New function.
	* d-lang.h (d_value_print_inner): Declare.
	* d-lang.c (d_language_defn): Use d_value_print_inner.
This commit is contained in:
Tom Tromey 2020-03-13 17:39:52 -06:00
parent 23b0f06be4
commit d133c3e1a8
4 changed files with 39 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2020-03-13 Tom Tromey <tom@tromey.com>
* d-valprint.c (dynamic_array_type): Call d_value_print_inner.
(d_value_print_inner): New function.
* d-lang.h (d_value_print_inner): Declare.
* d-lang.c (d_language_defn): Use d_value_print_inner.
2020-03-13 Tom Tromey <tom@tromey.com>
* go-valprint.c (go_value_print_inner): New function.

View File

@ -225,7 +225,7 @@ extern const struct language_defn d_language_defn =
c_print_typedef, /* Print a typedef using appropriate
syntax. */
d_val_print, /* Print a value using appropriate syntax. */
nullptr, /* la_value_print_inner */
d_value_print_inner, /* la_value_print_inner */
c_value_print, /* Print a top-level value. */
default_read_var_value, /* la_read_var_value */
NULL, /* Language specific skip_trampoline. */

View File

@ -84,4 +84,10 @@ extern void d_val_print (struct type *type,
struct value *val,
const struct value_print_options *options);
/* Implement la_value_print_inner for D. */
extern void d_value_print_inner (struct value *val,
struct ui_file *stream, int recurse,
const struct value_print_options *options);
#endif /* !defined (D_LANG_H) */

View File

@ -63,9 +63,7 @@ dynamic_array_type (struct type *type,
ival = value_at (true_type, addr);
true_type = value_type (ival);
d_val_print (true_type,
value_embedded_offset (ival), addr,
stream, recurse + 1, ival, options);
d_value_print_inner (ival, stream, recurse + 1, options);
return 0;
}
return 1;
@ -94,3 +92,27 @@ d_val_print (struct type *type, int embedded_offset,
recurse, val, options);
}
}
/* See d-lang.h. */
void
d_value_print_inner (struct value *val, struct ui_file *stream, int recurse,
const struct value_print_options *options)
{
int ret;
struct type *type = check_typedef (value_type (val));
switch (TYPE_CODE (type))
{
case TYPE_CODE_STRUCT:
ret = dynamic_array_type (type, value_embedded_offset (val),
value_address (val),
stream, recurse, val, options);
if (ret == 0)
break;
/* Fall through. */
default:
c_value_print_inner (val, stream, recurse, options);
break;
}
}