This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[RFA 2/2] Linespec rewrite - remove dead code
- From: Keith Seitz <keiths at redhat dot com>
- To: "gdb-patches at sourceware dot org ml" <gdb-patches at sourceware dot org>
- Date: Mon, 26 Mar 2012 16:17:25 -0700
- Subject: [RFA 2/2] Linespec rewrite - remove dead code
Hi,
This is a small patch from the mega-linespec patch which removes dead
code. cp_validate_operator is no longer used/necessary.
Keith
ChangeLog
2012-03-26 Keith Seitz <keiths@redhat.com>
* cp-support.c (SKIP_SPACE): Remove.
(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..e73715b 100644
--- a/gdb/cp-support.c
+++ b/gdb/cp-support.c
@@ -1459,110 +1459,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);