diff options
author | Pedro Alves <palves@redhat.com> | 2017-07-17 15:51:55 +0100 |
---|---|---|
committer | Pedro Alves <palves@redhat.com> | 2017-07-17 15:51:55 +0100 |
commit | 8090b426b57bd9ebfa4c593ba3e6f939b2911739 (patch) | |
tree | 76234c2ece65a1b19b697e0352adfdae343638c0 /gdb/c-exp.y | |
parent | 6a2c1b8790e58ce0688507b5b1f8369aa621a665 (diff) | |
download | gdb-8090b426b57bd9ebfa4c593ba3e6f939b2911739.zip gdb-8090b426b57bd9ebfa4c593ba3e6f939b2911739.tar.gz gdb-8090b426b57bd9ebfa4c593ba3e6f939b2911739.tar.bz2 |
Introduce CP_OPERATOR_STR/CP_OPERATOR_LEN and use throughout
Move LENGTH_OF_OPERATOR from cp-support.c to cp-support.h so we can
use it elsewhere. Since there's already
CP_ANONYMOUS_NAMESPACE_STR/CP_ANONYMOUS_NAMESPACE_LEN there, follow
the same naming pattern for the new symbols.
gdb/ChangeLog:
2017-07-17 Pedro Alves <palves@redhat.com>
* c-exp.y (operator_stoken): Use CP_OPERATOR_LEN and
CP_OPERATOR_STR.
* c-typeprint.c (is_type_conversion_operator): Use
CP_OPERATOR_STR.
* cp-support.c (LENGTH_OF_OPERATOR): Delete.
(cp_find_first_component_aux): Use CP_OPERATOR_STR and
CP_OPERATOR_LEN.
* cp-support.h (CP_OPERATOR_STR, CP_OPERATOR_LEN): New.
* gnu-v2-abi.c (gnuv2_is_operator_name): Use CP_OPERATOR_STR.
* gnu-v3-abi.c (gnuv3_is_operator_name): Use CP_OPERATOR_STR.
* linespec.c (linespec_lexer_lex_string): Use CP_OPERATOR_LEN and
CP_OPERATOR_STR.
* location.c: Include "cp-support.h".
(explicit_location_lex_one): Use CP_OPERATOR_LEN and
CP_OPERATOR_STR.
* symtab.c (operator_chars): Use CP_OPERATOR_STR and
CP_OPERATOR_LEN.
Diffstat (limited to 'gdb/c-exp.y')
-rw-r--r-- | gdb/c-exp.y | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gdb/c-exp.y b/gdb/c-exp.y index bdcd51f..24a2fbd 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -1625,13 +1625,12 @@ write_destructor_name (struct parser_state *par_state, struct stoken token) static struct stoken operator_stoken (const char *op) { - static const char *operator_string = "operator"; struct stoken st = { NULL, 0 }; char *buf; - st.length = strlen (operator_string) + strlen (op); + st.length = CP_OPERATOR_LEN + strlen (op); buf = (char *) malloc (st.length + 1); - strcpy (buf, operator_string); + strcpy (buf, CP_OPERATOR_STR); strcat (buf, op); st.ptr = buf; |