From d0aa28e155baf16ec37afdf0193c3d58816c1927 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 23 Feb 2023 10:45:47 -0700 Subject: [PATCH] Hide the implementation of gdb_mpf This renames the data member of gdb_mpf and makes it private. It also adds a single new method to aid in this change. Unlike the earlier changes here, I did this one all together because gdb_mpf has very few uses. --- gdb/gmp-utils.h | 17 ++++++++++++----- gdb/valprint.c | 2 +- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/gdb/gmp-utils.h b/gdb/gmp-utils.h index 66db51014e2..7bb846026ae 100644 --- a/gdb/gmp-utils.h +++ b/gdb/gmp-utils.h @@ -388,10 +388,8 @@ private: struct gdb_mpf { - mpf_t val; - /* Constructors. */ - gdb_mpf () { mpf_init (val); } + gdb_mpf () { mpf_init (m_val); } DISABLE_COPY_AND_ASSIGN (gdb_mpf); @@ -409,11 +407,20 @@ struct gdb_mpf gdb_mpq tmp_q; tmp_q.read_fixed_point (buf, byte_order, unsigned_p, scaling_factor); - mpf_set_q (val, tmp_q.m_val); + mpf_set_q (m_val, tmp_q.m_val); } + /* Convert this value to a string. FMT is the format to use, and + should have a single '%' substitution. */ + std::string str (const char *fmt) const + { return gmp_string_printf (fmt, m_val); } + /* The destructor. */ - ~gdb_mpf () { mpf_clear (val); } + ~gdb_mpf () { mpf_clear (m_val); } + +private: + + mpf_t m_val; }; /* See declaration above. */ diff --git a/gdb/valprint.c b/gdb/valprint.c index 357db3815b0..b05d90dd26b 100644 --- a/gdb/valprint.c +++ b/gdb/valprint.c @@ -856,7 +856,7 @@ generic_val_print_fixed_point (struct value *val, struct ui_file *stream, type->fixed_point_scaling_factor ()); const char *fmt = type->length () < 4 ? "%.11Fg" : "%.17Fg"; - std::string str = gmp_string_printf (fmt, f.val); + std::string str = f.str (fmt); gdb_printf (stream, "%s", str.c_str ()); } } -- 2.30.2