c00f848495
up the symbol. (name_end): New function. (keep_name_info): New function. (decode_line_1): Use keep_name_info. (decode_compound): Likewise. * cli/cli-utils.h (remove_trailing_whitespace): New function. * cli/cli-utils.c (remove_trailing_whitespace): Likewise. PR c++/12273 * linespec.c (locate_first_half): Keep overload information, too. (decode_compound): Use a string to represent break characters to escape the loop. If P points to a break character, do not increment it. For C++ and Java, keep overload information and relevant keywords. If we cannot find a symbol, search the minimal symbols. PR c++/11734 * linespec.c (decode_compound): Rename SAVED_ARG to THE_REAL_SAVED_ARG. Make a copy of THE_REAL_SAVED_ARG in SAVED_ARG and strip single-quotes. Pass a valid block to lookup_symbol. (lookup_prefix_sym): Likewise. (find_method): Construct search name based on SYM_CLASS instead of SAVED_ARG. * psymtab.c (lookup_partial_symbol): Add language parameter. (lookup_symbol_aux_psymtabs): Likewise. Don't assume that the psymtab we found was the right one. Search for the desired symbol in the symtab to be certain. (psymtab_search_name): New function. (lookup_partial_symbol): Use psymtab_search_name. Add language parameter. (read_symtabs_for_function): Add language parameter and pass to lookup_partial_symbol. (find_symbol_file_from_partial): Likewise.
106 lines
3.6 KiB
C
106 lines
3.6 KiB
C
/* CLI utilities.
|
|
|
|
Copyright (c) 2011 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 of the. Advance
|
|
*PP after the string and any trailing whitespace.
|
|
|
|
Currently the string can either be a number, or "$" followed by the
|
|
name of a convenience variable, or ("$" or "$$") followed by digits. */
|
|
|
|
extern int get_number (char **);
|
|
|
|
/* An object of this type is passed to get_number_or_range. It must
|
|
be initialized by calling init_number_or_range. This type is
|
|
defined here so that it can be stack-allocated, but all members
|
|
other than `finished' and `string' should be treated as opaque. */
|
|
|
|
struct get_number_or_range_state
|
|
{
|
|
/* Non-zero if parsing has completed. */
|
|
int finished;
|
|
|
|
/* The string being parsed. When parsing has finished, this points
|
|
past the last parsed token. */
|
|
char *string;
|
|
|
|
/* Last value returned. */
|
|
int last_retval;
|
|
|
|
/* When parsing a range, the final value in the range. */
|
|
int end_value;
|
|
|
|
/* When parsing a range, a pointer past the final token in the
|
|
range. */
|
|
char *end_ptr;
|
|
|
|
/* Non-zero when parsing a range. */
|
|
int in_range;
|
|
};
|
|
|
|
/* Initialize a get_number_or_range_state for use with
|
|
get_number_or_range_state. STRING is the string to be parsed. */
|
|
|
|
extern void init_number_or_range (struct get_number_or_range_state *state,
|
|
char *string);
|
|
|
|
/* 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.
|
|
|
|
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->string 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>. */
|
|
|
|
extern int get_number_or_range (struct get_number_or_range_state *state);
|
|
|
|
/* 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 (char *list, int number);
|
|
|
|
/* Skip leading whitespace characters in INP, returning an updated
|
|
pointer. If INP is NULL, return NULL. */
|
|
|
|
extern char *skip_spaces (char *inp);
|
|
|
|
/* Skip leading non-whitespace characters in INP, returning an updated
|
|
pointer. If INP is NULL, return NULL. */
|
|
|
|
extern char *skip_to_space (char *inp);
|
|
|
|
/* Reverse S to the last non-whitespace character without skipping past
|
|
START. */
|
|
|
|
extern char *remove_trailing_whitespace (const char *start, char *s);
|
|
#endif /* CLI_UTILS_H */
|