bfd282882d
This converts tid_range_parser and get_number_or_range to be classes. The various tid_range_parser_* and get_number_or_range_* functions become methods on the respective classes. Then it updates the users to follow. The rationale for the change is that this provides better encapsulation. For example, this forced me to think of a better interface between tid_range_parser and get_number_or_range, since the former peeked into the latter's internals a bit too much. That ended up resulting mostly in these two not-just-straight-1-1 changes: void -tid_range_parser_skip (struct tid_range_parser *parser) +tid_range_parser::skip_range () { ... - tid_range_parser_init (parser, parser->range_parser.end_ptr, - parser->default_inferior); + m_range_parser.skip_range (); + init (m_range_parser.string (), m_default_inferior); } and: /* If we successfully parsed a thread number or finished parsing a thread range, switch back to assuming the next TID is inferior-qualified. */ - if (parser->range_parser.end_ptr == NULL - || parser->range_parser.string == parser->range_parser.end_ptr) + if (!m_range_parser.in_range ()) { For the same reason (encapsulation), this moves the enum tid_range_state definition to within the tid_parser class's scope, since that is private implementation detail. While at it, switch to use "bool" for booleans. gdb/ChangeLog: 2016-10-13 Pedro Alves <palves@redhat.com> Tom Tromey <tom@tromey.com> * tid-parse.h (tid_range_parser): New class. (enum tid_range_state): Move into tid_range_parser's scope. Remove TID_RANGE_ prefix from all values. (tid_range_parser_get_tid, tid_range_parser_get_tid_range) (tid_range_parser_star_range, tid_range_parser_finished) (tid_range_parser_skip, tid_range_parser_qualified): Don't declare. (tid_is_in_list): Update comment. * tid-parse.c (tid_range_parser::tid_range_parser): New. (init, finished, get_string, skip, tid_is_qualified) (get_tid_or_range, get_tid_range, get_tid, star_range): Rename; turn into methods. (tid_is_in_list): Adjust. * cli/cli-utils.h (number_or_range_parser): New class. (init_number_or_range, get_number_or_range) (number_range_setup_range): Don't declare. * cli/cli-utils.c (number_or_range_parser::number_or_range_parser): New. (init_number_or_range, get_number_or_range) (number_range_setup_range): Rename; turn into methods. (number_is_in_list): Adjust. * breakpoint.c (map_breakpoint_numbers): Adjust. Use bool. (trace_pass_command, get_tracepoint_by_number): Adjust. * breakpoint.h (get_tracepoint_by_number): Adjust. * inferior.c (detach_inferior_command, kill_inferior_command) (remove_inferior_command): Adjust. * linespec.c (decode_line_2): Adjust. * memattr.c (mem_enable_command, mem_disable_command) (mem_delete_command): Adjust. * printcmd.c (map_display_numbers): Adjust. * reverse.c (delete_bookmark_command, bookmarks_info): Adjust. * thread.c (thread_apply_command): Adjust.
162 lines
5.3 KiB
C++
162 lines
5.3 KiB
C++
/* CLI utilities.
|
|
|
|
Copyright (C) 2011-2016 Free Software Foundation, Inc.
|
|
|
|
This file is part of GDB.
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef CLI_UTILS_H
|
|
#define CLI_UTILS_H
|
|
|
|
/* *PP is a string denoting a number. Get the number. Advance *PP
|
|
after the string and any trailing whitespace.
|
|
|
|
The string can either be a number, or "$" followed by the name of a
|
|
convenience variable, or ("$" or "$$") followed by digits.
|
|
|
|
TRAILER is a character which can be found after the number; most
|
|
commonly this is `-'. If you don't want a trailer, use \0. */
|
|
|
|
extern int get_number_trailer (const char **pp, int trailer);
|
|
|
|
/* Convenience. Like get_number_trailer, but with no TRAILER. */
|
|
|
|
extern int get_number_const (const char **);
|
|
|
|
/* Like get_number_const, but takes a non-const "char **". */
|
|
|
|
extern int get_number (char **);
|
|
|
|
/* Parse a number or a range.
|
|
A number will be of the form handled by get_number.
|
|
A range will be of the form <number1> - <number2>, and
|
|
will represent all the integers between number1 and number2,
|
|
inclusive. */
|
|
|
|
class number_or_range_parser
|
|
{
|
|
public:
|
|
/* Default construction. Must call init before calling
|
|
get_next. */
|
|
number_or_range_parser () {}
|
|
|
|
/* Calls init automatically. */
|
|
number_or_range_parser (const char *string);
|
|
|
|
/* STRING is the string to be parsed. */
|
|
void init (const char *string);
|
|
|
|
/* While processing a range, this fuction is called iteratively; At
|
|
each call it will return the next value in the range.
|
|
|
|
At the beginning of parsing a range, the char pointer
|
|
STATE->m_cur_tok will be advanced past <number1> and left
|
|
pointing at the '-' token. Subsequent calls will not advance the
|
|
pointer until the range is completed. The call that completes
|
|
the range will advance the pointer past <number2>. */
|
|
int get_number ();
|
|
|
|
/* Setup internal state such that get_next() returns numbers in the
|
|
START_VALUE to END_VALUE range. END_PTR is where the string is
|
|
advanced to when get_next() returns END_VALUE. */
|
|
void setup_range (int start_value, int end_value,
|
|
const char *end_ptr);
|
|
|
|
/* Returns true if parsing has completed. */
|
|
bool finished () const
|
|
{ return m_finished; }
|
|
|
|
/* Return the string being parsed. When parsing has finished, this
|
|
points past the last parsed token. */
|
|
const char *cur_tok () const
|
|
{ return m_cur_tok; }
|
|
|
|
/* True when parsing a range. */
|
|
bool in_range () const
|
|
{ return m_in_range; }
|
|
|
|
/* When parsing a range, the final value in the range. */
|
|
int end_value () const
|
|
{ return m_end_value; }
|
|
|
|
/* When parsing a range, skip past the final token in the range. */
|
|
void skip_range ()
|
|
{
|
|
gdb_assert (m_in_range);
|
|
m_cur_tok = m_end_ptr;
|
|
}
|
|
|
|
private:
|
|
/* No need for these. They are intentionally not defined anywhere. */
|
|
number_or_range_parser (const number_or_range_parser &);
|
|
number_or_range_parser &operator= (const number_or_range_parser &);
|
|
|
|
/* True if parsing has completed. */
|
|
bool m_finished;
|
|
|
|
/* The string being parsed. When parsing has finished, this points
|
|
past the last parsed token. */
|
|
const char *m_cur_tok;
|
|
|
|
/* Last value returned. */
|
|
int m_last_retval;
|
|
|
|
/* When parsing a range, the final value in the range. */
|
|
int m_end_value;
|
|
|
|
/* When parsing a range, a pointer past the final token in the
|
|
range. */
|
|
const char *m_end_ptr;
|
|
|
|
/* True when parsing a range. */
|
|
bool m_in_range;
|
|
};
|
|
|
|
/* Accept a number and a string-form list of numbers such as is
|
|
accepted by get_number_or_range. Return TRUE if the number is
|
|
in the list.
|
|
|
|
By definition, an empty list includes all numbers. This is to
|
|
be interpreted as typing a command such as "delete break" with
|
|
no arguments. */
|
|
|
|
extern int number_is_in_list (const char *list, int number);
|
|
|
|
/* Reverse S to the last non-whitespace character without skipping past
|
|
START. */
|
|
|
|
extern char *remove_trailing_whitespace (const char *start, char *s);
|
|
|
|
/* A helper function to extract an argument from *ARG. An argument is
|
|
delimited by whitespace. The return value is either NULL if no
|
|
argument was found, or an xmalloc'd string. */
|
|
|
|
extern char *extract_arg (char **arg);
|
|
|
|
/* A const-correct version of "extract_arg".
|
|
|
|
Since the returned value is xmalloc'd, it eventually needs to be
|
|
xfree'ed, which prevents us from making it const as well. */
|
|
|
|
extern char *extract_arg_const (const char **arg);
|
|
|
|
/* A helper function that looks for an argument at the start of a
|
|
string. The argument must also either be at the end of the string,
|
|
or be followed by whitespace. Returns 1 if it finds the argument,
|
|
0 otherwise. If the argument is found, it updates *STR. */
|
|
extern int check_for_argument (char **str, char *arg, int arg_len);
|
|
|
|
#endif /* CLI_UTILS_H */
|