This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [RFA 2/2] Linespec rewrite - remove dead code
- From: Keith Seitz <keiths at redhat dot com>
- To: Tom Tromey <tromey at redhat dot com>
- Cc: "gdb-patches at sourceware dot org ml" <gdb-patches at sourceware dot org>
- Date: Tue, 03 Apr 2012 16:23:38 -0700
- Subject: Re: [RFA 2/2] Linespec rewrite - remove dead code
- References: <4F70F905.40806@redhat.com> <87ehscy2uz.fsf@fleche.redhat.com>
On 03/28/2012 11:52 AM, Tom Tromey wrote:
"Keith" == Keith Seitz<keiths@redhat.com> writes:
Keith> 2012-03-26 Keith Seitz<keiths@redhat.com>
Keith> * cp-support.c (SKIP_SPACE): Remove.
Keith> (cp_validate_operator): Remove.
Keith> * cp-support.h (cp_validate_operator): Remove declaration.
This is ok once the rest is approved.
This changed a little bit. It turns out we can also remove
operator_tokens from that file, since it, too, is no longer used.
Keith
ChangeLog
2012-04-03 Keith Seitz <keiths@redhat.com>
* cp-support.c (SKIP_SPACE): Remove.
(operator_tokens): Remove unused global.
(cp_validate_operator): Remove.
* cp-support.h (cp_validate_operator): Remove declaration.
diff --git a/gdb/cp-support.c b/gdb/cp-support.c
index a41bcec..025b4de 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -73,19 +73,6 @@ struct cmd_list_element *maint_cplus_cmd_list = NULL;
static void maint_cplus_command (char *arg, int from_tty);
static void first_component_command (char *arg, int from_tty);
-/* Operator validation.
- NOTE: Multi-byte operators (usually the assignment variety
- operator) must appear before the single byte version, i.e., "+="
- before "+". */
-static const char *operator_tokens[] =
- {
- "++", "+=", "+", "->*", "->", "--", "-=", "-", "*=", "*",
- "/=", "/", "%=", "%", "!=", "==", "!", "&&", "<<=", "<<",
- ">>=", ">>", "<=", "<", ">=", ">", "~", "&=", "&", "|=",
- "||", "|", "^=", "^", "=", "()", "[]", ",", "new", "delete"
- /* new[] and delete[] require special whitespace handling */
- };
-
/* A list of typedefs which should not be substituted by replace_typedefs. */
static const char * const ignore_typedefs[] =
{
@@ -1459,110 +1446,6 @@ first_component_command (char *arg, int from_tty)
extern initialize_file_ftype _initialize_cp_support; /* -Wmissing-prototypes */
-#define SKIP_SPACE(P) \
- do \
- { \
- while (*(P) == ' ' || *(P) == '\t') \
- ++(P); \
- } \
- while (0)
-
-/* Returns the length of the operator name or 0 if INPUT does not
- point to a valid C++ operator. INPUT should start with
- "operator". */
-int
-cp_validate_operator (const char *input)
-{
- int i;
- char *copy;
- const char *p;
- struct expression *expr;
- struct value *val;
- volatile struct gdb_exception except;
-
- p = input;
-
- if (strncmp (p, "operator", 8) == 0)
- {
- int valid = 0;
-
- p += 8;
- SKIP_SPACE (p);
- for (i = 0;
- i < sizeof (operator_tokens) / sizeof (operator_tokens[0]);
- ++i)
- {
- int length = strlen (operator_tokens[i]);
-
- /* By using strncmp here, we MUST have operator_tokens
- ordered! See additional notes where operator_tokens is
- defined above. */
- if (strncmp (p, operator_tokens[i], length) == 0)
- {
- const char *op = p;
-
- valid = 1;
- p += length;
-
- if (strncmp (op, "new", 3) == 0
- || strncmp (op, "delete", 6) == 0)
- {
-
- /* Special case: new[] and delete[]. We must be
- careful to swallow whitespace before/in "[]". */
- SKIP_SPACE (p);
-
- if (*p == '[')
- {
- ++p;
- SKIP_SPACE (p);
- if (*p == ']')
- ++p;
- else
- valid = 0;
- }
- }
-
- if (valid)
- return (p - input);
- }
- }
-
- /* Check input for a conversion operator. */
-
- /* Skip past base typename. */
- while (*p != '*' && *p != '&' && *p != 0 && *p != ' ')
- ++p;
- SKIP_SPACE (p);
-
- /* Add modifiers '*' / '&'. */
- while (*p == '*' || *p == '&')
- {
- ++p;
- SKIP_SPACE (p);
- }
-
- /* Check for valid type. [Remember: input starts with
- "operator".] */
- copy = savestring (input + 8, p - input - 8);
- expr = NULL;
- val = NULL;
- TRY_CATCH (except, RETURN_MASK_ALL)
- {
- expr = parse_expression (copy);
- val = evaluate_type (expr);
- }
-
- xfree (copy);
- if (expr)
- xfree (expr);
-
- if (val != NULL && value_type (val) != NULL)
- return (p - input);
- }
-
- return 0;
-}
/* Implement "info vtbl". */
diff --git a/gdb/cp-support.h b/gdb/cp-support.h
index 8898807..5988418 100644
--- a/gdb/cp-support.h
+++ b/gdb/cp-support.h
@@ -170,8 +170,6 @@ extern struct symbol **make_symbol_overload_list_adl (struct type **arg_types,
extern struct type *cp_lookup_rtti_type (const char *name,
struct block *block);
-extern int cp_validate_operator (const char *input);
-
/* Functions/variables from cp-namespace.c. */
extern int cp_is_anonymous (const char *namespace);