public inbox for gdb-cvs@sourceware.org help / color / mirror / Atom feed
From: Tom Tromey <tromey@sourceware.org> To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Introduce mi_parse helper methods Date: Tue, 23 May 2023 19:47:52 +0000 (GMT) [thread overview] Message-ID: <20230523194752.DFE6B3858291@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=6b2cb925fe4a65ae96c7603b5d002712b66c7122 commit 6b2cb925fe4a65ae96c7603b5d002712b66c7122 Author: Tom Tromey <tromey@adacore.com> Date: Mon Mar 20 11:25:12 2023 -0600 Introduce mi_parse helper methods This introduces some helper methods for mi_parse that handle some of the details of parsing. This approach lets us reuse them later. Diff: --- gdb/mi/mi-parse.c | 69 +++++++++++++++++++++++++++++++++++++++++-------------- gdb/mi/mi-parse.h | 9 ++++++++ 2 files changed, 61 insertions(+), 17 deletions(-) diff --git a/gdb/mi/mi-parse.c b/gdb/mi/mi-parse.c index b7c5a8cecdf..09207164291 100644 --- a/gdb/mi/mi-parse.c +++ b/gdb/mi/mi-parse.c @@ -215,6 +215,54 @@ mi_parse::~mi_parse () freeargv (argv); } +/* See mi-parse.h. */ + +void +mi_parse::set_thread_group (const char *arg, char **endp) +{ + if (thread_group != -1) + error (_("Duplicate '--thread-group' option")); + if (*arg != 'i') + error (_("Invalid thread group id")); + arg += 1; + thread_group = strtol (arg, endp, 10); +} + +/* See mi-parse.h. */ + +void +mi_parse::set_thread (const char *arg, char **endp) +{ + if (thread != -1) + error (_("Duplicate '--thread' option")); + thread = strtol (arg, endp, 10); +} + +/* See mi-parse.h. */ + +void +mi_parse::set_frame (const char *arg, char **endp) +{ + if (frame != -1) + error (_("Duplicate '--frame' option")); + frame = strtol (arg, endp, 10); +} + +/* See mi-parse.h. */ + +void +mi_parse::set_language (const char *arg, const char **endp) +{ + std::string lang_name = extract_arg (&arg); + + language = language_enum (lang_name.c_str ()); + if (language == language_unknown) + error (_("Invalid --language argument: %s"), lang_name.c_str ()); + + if (endp != nullptr) + *endp = arg; +} + std::unique_ptr<struct mi_parse> mi_parse::make (const char *cmd, char **token) { @@ -295,13 +343,8 @@ mi_parse::make (const char *cmd, char **token) char *endp; option = "--thread-group"; - if (parse->thread_group != -1) - error (_("Duplicate '--thread-group' option")); chp += tgs; - if (*chp != 'i') - error (_("Invalid thread group id")); - chp += 1; - parse->thread_group = strtol (chp, &endp, 10); + parse->set_thread_group (chp, &endp); chp = endp; } else if (strncmp (chp, "--thread ", ts) == 0) @@ -309,10 +352,8 @@ mi_parse::make (const char *cmd, char **token) char *endp; option = "--thread"; - if (parse->thread != -1) - error (_("Duplicate '--thread' option")); chp += ts; - parse->thread = strtol (chp, &endp, 10); + parse->set_thread (chp, &endp); chp = endp; } else if (strncmp (chp, "--frame ", fs) == 0) @@ -320,21 +361,15 @@ mi_parse::make (const char *cmd, char **token) char *endp; option = "--frame"; - if (parse->frame != -1) - error (_("Duplicate '--frame' option")); chp += fs; - parse->frame = strtol (chp, &endp, 10); + parse->set_frame (chp, &endp); chp = endp; } else if (strncmp (chp, "--language ", ls) == 0) { option = "--language"; chp += ls; - std::string lang_name = extract_arg (&chp); - - parse->language = language_enum (lang_name.c_str ()); - if (parse->language == language_unknown) - error (_("Invalid --language argument: %s"), lang_name.c_str ()); + parse->set_language (chp, &chp); } else break; diff --git a/gdb/mi/mi-parse.h b/gdb/mi/mi-parse.h index 6f1da6e6eb5..19c41f23ed6 100644 --- a/gdb/mi/mi-parse.h +++ b/gdb/mi/mi-parse.h @@ -84,6 +84,15 @@ struct mi_parse mi_parse () = default; + /* Helper methods for parsing arguments. Each takes the argument + to be parsed. It will either set a member of this object, or + throw an exception on error. In each case, *ENDP, if non-NULL, + will be updated to just after the argument text. */ + void set_thread_group (const char *arg, char **endp); + void set_thread (const char *arg, char **endp); + void set_frame (const char *arg, char **endp); + void set_language (const char *arg, const char **endp); + std::string m_args; };
reply other threads:[~2023-05-23 19:47 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230523194752.DFE6B3858291@sourceware.org \ --to=tromey@sourceware.org \ --cc=gdb-cvs@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: linkBe 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).