From 4f412b6e31369f27725872391a70f0520883701c Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 13 Mar 2020 17:39:52 -0600 Subject: Introduce generic_value_print_complex This adds generic_value_print_complex, a value-based analogue of generic_val_print_complex. gdb/ChangeLog 2020-03-13 Tom Tromey * valprint.c (generic_value_print_complex): New function. (generic_value_print): Use it. --- gdb/ChangeLog | 5 +++++ gdb/valprint.c | 27 +++++++++++++++++++++++++-- 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c2b0550..227f9a9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-03-13 Tom Tromey + * valprint.c (generic_value_print_complex): New function. + (generic_value_print): Use it. + +2020-03-13 Tom Tromey + * valprint.c (generic_val_print_float): Don't call val_print_scalar_formatted. (generic_val_print, generic_value_print): Update. diff --git a/gdb/valprint.c b/gdb/valprint.c index f759e0a..5bf874e 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -966,6 +966,30 @@ generic_val_print_complex (struct type *type, fprintf_filtered (stream, "%s", decorations->complex_suffix); } +/* generic_value_print helper for TYPE_CODE_COMPLEX. */ + +static void +generic_value_print_complex (struct value *val, struct ui_file *stream, + const struct value_print_options *options, + const struct generic_val_print_decorations + *decorations) +{ + fprintf_filtered (stream, "%s", decorations->complex_prefix); + + struct type *type = check_typedef (value_type (val)); + struct value *real_part + = value_from_component (val, TYPE_TARGET_TYPE (type), 0); + value_print_scalar_formatted (real_part, options, 0, stream); + fprintf_filtered (stream, "%s", decorations->complex_infix); + + struct value *imag_part + = value_from_component (val, TYPE_TARGET_TYPE (type), + TYPE_LENGTH (TYPE_TARGET_TYPE (type))); + + value_print_scalar_formatted (imag_part, options, 0, stream); + fprintf_filtered (stream, "%s", decorations->complex_suffix); +} + /* A generic val_print that is suitable for use by language implementations of the la_val_print method. This function can handle most type codes, though not all, notably exception @@ -1206,8 +1230,7 @@ generic_value_print (struct value *val, struct ui_file *stream, int recurse, break; case TYPE_CODE_COMPLEX: - generic_val_print_complex (type, 0, stream, - val, options, decorations); + generic_value_print_complex (val, stream, options, decorations); break; case TYPE_CODE_UNION: -- cgit v1.1