From: Simon Marchi <simon.marchi@polymtl.ca>
To: gdb-patches@sourceware.org
Cc: Simon Marchi <simon.marchi@polymtl.ca>
Subject: [PATCH 16/22] Class-ify ui_out_level
Date: Thu, 24 Nov 2016 15:28:00 -0000 [thread overview]
Message-ID: <20161124152710.25007-16-simon.marchi@polymtl.ca> (raw)
In-Reply-To: <20161124152428.24725-1-simon.marchi@polymtl.ca>
This patch changes struct ui_out_level to be a real C++ class. No
behavioral changes.
gdb/ChangeLog:
* ui-out.c (struct ui_out_level): Replace with ...
(class ui_out_level): ... this.
(current_level): Update.
(push_level): Update.
(pop_level): Update.
(verify_field): Update.
(ui_out_new): Update.
---
gdb/ui-out.c | 65 ++++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 44 insertions(+), 21 deletions(-)
diff --git a/gdb/ui-out.c b/gdb/ui-out.c
index 410f40c..594338a 100644
--- a/gdb/ui-out.c
+++ b/gdb/ui-out.c
@@ -90,13 +90,41 @@ class ui_out_hdr
std::string m_header;
};
-struct ui_out_level
+/* A level of nesting (either a list or a tuple) in a ui_out output. */
+
+class ui_out_level
+{
+ public:
+
+ ui_out_level (ui_out_type type)
+ : m_type (type),
+ m_field_count (0)
{
- /* Count each field; the first element is for non-list fields. */
- int field_count;
- /* The type of this level. */
- enum ui_out_type type;
- };
+ }
+
+ ui_out_type type (void) const
+ {
+ return m_type;
+ }
+
+ int field_count (void) const
+ {
+ return m_field_count;
+ }
+
+ void inc_field_count (void)
+ {
+ m_field_count++;
+ }
+
+ private:
+
+ /* The type of this level. */
+ ui_out_type m_type;
+
+ /* Count each field; the first element is for non-list fields. */
+ int m_field_count;
+};
/* Tables are special. Maintain a separate structure that tracks
@@ -153,7 +181,7 @@ struct ui_out
};
/* The current (inner most) level. */
-static struct ui_out_level *
+static ui_out_level *
current_level (struct ui_out *uiout)
{
return uiout->levels[uiout->level].get ();
@@ -164,13 +192,10 @@ static int
push_level (struct ui_out *uiout,
enum ui_out_type type)
{
- std::unique_ptr<ui_out_level> current (new ui_out_level ());
-
- current->field_count = 0;
- current->type = type;
+ std::unique_ptr<ui_out_level> level (new ui_out_level (type));
+ uiout->levels.push_back (std::move (level));
uiout->level++;
- uiout->levels.push_back (std::move (current));
return uiout->level;
}
@@ -183,7 +208,7 @@ pop_level (struct ui_out *uiout,
{
/* We had better not underflow the buffer. */
gdb_assert (uiout->level > 0);
- gdb_assert (current_level (uiout)->type == type);
+ gdb_assert (current_level (uiout)->type () == type);
uiout->levels.pop_back ();
uiout->level--;
@@ -798,7 +823,7 @@ static void
verify_field (struct ui_out *uiout, int *fldno, int *width,
enum ui_align *align)
{
- struct ui_out_level *current = current_level (uiout);
+ ui_out_level *current = current_level (uiout);
const char *text;
if (uiout->table.flag)
@@ -814,13 +839,13 @@ specified after table_body and inside a list."));
level is zero. */
}
- current->field_count += 1;
+ current->inc_field_count ();
if (uiout->table.body_flag
&& uiout->table.entry_level == uiout->level
&& get_next_header (uiout, fldno, width, align, &text))
{
- if (*fldno != current->field_count)
+ if (*fldno != current->field_count ())
internal_error (__FILE__, __LINE__,
_("ui-out internal error in handling headers."));
}
@@ -828,7 +853,7 @@ specified after table_body and inside a list."));
{
*width = 0;
*align = ui_noalign;
- *fldno = current->field_count;
+ *fldno = current->field_count ();
}
}
@@ -875,7 +900,6 @@ ui_out_new (const struct ui_out_impl *impl, void *data,
int flags)
{
struct ui_out *uiout = new ui_out ();
- std::unique_ptr<ui_out_level> current (new ui_out_level ());
uiout->data = data;
uiout->impl = impl;
@@ -885,9 +909,8 @@ ui_out_new (const struct ui_out_impl *impl, void *data,
uiout->level = 0;
/* Create uiout->level 0, the default level. */
- current->type = ui_out_type_tuple;
- current->field_count = 0;
- uiout->levels.push_back (std::move (current));
+ std::unique_ptr<ui_out_level> level (new ui_out_level (ui_out_type_tuple));
+ uiout->levels.push_back (std::move (level));
uiout->table.headers_iterator = uiout->table.headers.end ();
--
2.10.0
next prev parent reply other threads:[~2016-11-24 15:28 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-24 15:24 [PATCH 00/22] Convert ui-out subsystem to C++ Simon Marchi
2016-11-24 15:24 ` [PATCH 06/22] Remove verbosity from ui_out_message and friends Simon Marchi
2016-11-24 15:24 ` [PATCH 02/22] Rename ui_out_data to mi_ui_out_data Simon Marchi
2016-11-24 15:24 ` [PATCH 01/22] Remove unused functions and declarations Simon Marchi
2016-11-24 15:24 ` [PATCH 07/22] Remove stale comments Simon Marchi
2016-11-24 18:38 ` Pedro Alves
2016-11-26 15:29 ` Simon Marchi
2016-11-24 15:24 ` [PATCH 03/22] Remove ui_out_destroy Simon Marchi
2016-11-24 15:24 ` [PATCH 08/22] Use new/delete instead of malloc/free-based functions Simon Marchi
2016-11-24 15:24 ` [PATCH 09/22] Use std::vector for ui_out::levels Simon Marchi
2016-11-24 15:27 ` [PATCH 10/22] Use std::vector for mi_ui_out_data::streams Simon Marchi
2016-11-24 18:38 ` Pedro Alves
2016-11-26 15:48 ` Simon Marchi
2016-11-24 15:28 ` [PATCH 17/22] Simplify ui-out level code Simon Marchi
2016-11-24 18:42 ` Pedro Alves
2016-11-26 16:39 ` Simon Marchi
2016-11-30 12:08 ` Pedro Alves
2016-11-24 15:28 ` [PATCH 13/22] Replace hand-made linked list of ui_out_hdr by vector and iterator Simon Marchi
2016-11-24 18:41 ` Pedro Alves
2016-11-26 16:13 ` Simon Marchi
2016-12-01 20:22 ` Simon Marchi
2016-12-01 20:23 ` Pedro Alves
2016-11-24 15:28 ` Simon Marchi [this message]
2016-11-24 18:41 ` [PATCH 16/22] Class-ify ui_out_level Pedro Alves
2016-11-26 16:22 ` Simon Marchi
2016-11-30 12:07 ` Pedro Alves
2016-11-30 12:41 ` Antoine Tremblay
2016-11-30 13:27 ` Pedro Alves
2016-11-30 13:47 ` Antoine Tremblay
2016-11-30 14:17 ` Pedro Alves
2016-11-30 14:21 ` Antoine Tremblay
2016-11-30 20:40 ` Simon Marchi
2016-11-24 15:28 ` [PATCH 15/22] Class-ify ui_out_hdr Simon Marchi
2016-11-24 15:28 ` [PATCH 12/22] Use std::string in ui_out_table Simon Marchi
2016-11-24 15:28 ` [PATCH 14/22] Use std::string for ui_out_hdr's text fields Simon Marchi
2016-11-24 15:28 ` [PATCH 11/22] Use std::vector for cli_ui_out_data::streams Simon Marchi
2016-11-24 18:41 ` Pedro Alves
2016-11-26 15:51 ` Simon Marchi
2016-11-24 15:28 ` [PATCH 18/22] ui_out_table: Replace boolean flag with enum Simon Marchi
2016-11-24 18:42 ` Pedro Alves
2016-11-26 16:47 ` Simon Marchi
2016-11-30 12:10 ` Pedro Alves
2016-11-24 15:32 ` [PATCH 22/22] Introduce enum_flag type for ui_out flags Simon Marchi
2016-11-30 13:34 ` Pedro Alves
2016-11-30 21:32 ` Simon Marchi
2016-12-02 22:22 ` [pushed] " Simon Marchi
2016-11-24 15:36 ` [PATCH 05/22] Constify wrap_here/wrap_hint code path Simon Marchi
2016-11-24 15:36 ` [PATCH 04/22] Fix return value of uo_redirect Simon Marchi
2016-11-24 16:08 ` [PATCH 00/22] Convert ui-out subsystem to C++ Simon Marchi
2016-11-24 18:46 ` Pedro Alves
2016-11-24 19:15 ` Simon Marchi
2016-11-24 20:33 ` Simon Marchi
2016-11-24 18:47 ` Pedro Alves
2016-11-27 3:14 ` Simon Marchi
2016-12-01 2:51 ` Simon Marchi
2016-12-01 21:24 ` Simon Marchi
2016-11-24 19:11 ` [PATCH 20/22] Class-ify ui_out_table Simon Marchi
2016-11-30 12:29 ` Pedro Alves
2016-11-24 19:19 ` [PATCH 21/22] Class-ify ui_out Simon Marchi
2016-11-30 12:46 ` Pedro Alves
2016-11-30 21:47 ` Simon Marchi
2016-11-26 15:20 ` [PATCH 19/22] Class-ify ui_out_impl simon.marchi
2016-11-30 13:09 ` Pedro Alves
2016-11-30 22:38 ` Simon Marchi
2016-11-30 22:58 ` Pedro Alves
2016-12-01 19:04 ` Simon Marchi
2016-12-01 19:30 ` Pedro Alves
[not found] ` <20161124153228.25177-20-simon.marchi@polymtl.ca>
2016-11-26 17:18 ` [PATCH 20/22] Class-ify ui_out_table Simon Marchi
2016-11-30 12:30 ` Pedro Alves
2016-11-30 21:48 ` [PATCH v2] " Simon Marchi
2016-11-30 23:01 ` Pedro Alves
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161124152710.25007-16-simon.marchi@polymtl.ca \
--to=simon.marchi@polymtl.ca \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).