diff options
author | Tom Tromey <tromey@adacore.com> | 2023-03-20 11:25:12 -0600 |
---|---|---|
committer | Tom Tromey <tromey@adacore.com> | 2023-05-23 10:09:27 -0600 |
commit | 6b2cb925fe4a65ae96c7603b5d002712b66c7122 (patch) | |
tree | f48ba61bfdd8af17e7d19606615d7a0d452bb553 /gdb/mi | |
parent | fde3f93adb50c9937cd2e1c93561aea2fd167156 (diff) | |
download | gdb-6b2cb925fe4a65ae96c7603b5d002712b66c7122.zip gdb-6b2cb925fe4a65ae96c7603b5d002712b66c7122.tar.gz gdb-6b2cb925fe4a65ae96c7603b5d002712b66c7122.tar.bz2 |
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.
Diffstat (limited to 'gdb/mi')
-rw-r--r-- | gdb/mi/mi-parse.c | 69 | ||||
-rw-r--r-- | 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 b7c5a8c..0920716 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 6f1da6e..19c41f2 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; }; |