From fe978cb071b460b2d4aed2f9a71d895f84efce0e Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 27 Feb 2015 16:33:07 +0000 Subject: C++ keyword cleanliness, mostly auto-generated This patch renames symbols that happen to have names which are reserved keywords in C++. Most of this was generated with Tromey's cxx-conversion.el script. Some places where later hand massaged a bit, to fix formatting, etc. And this was rebased several times meanwhile, along with re-running the script, so re-running the script from scratch probably does not result in the exact same output. I don't think that matters anyway. gdb/ 2015-02-27 Tom Tromey Pedro Alves Rename symbols whose names are reserved C++ keywords throughout. gdb/gdbserver/ 2015-02-27 Tom Tromey Pedro Alves Rename symbols whose names are reserved C++ keywords throughout. --- gdb/d-exp.y | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gdb/d-exp.y') diff --git a/gdb/d-exp.y b/gdb/d-exp.y index c6543ca..9936b6b 100644 --- a/gdb/d-exp.y +++ b/gdb/d-exp.y @@ -946,7 +946,7 @@ parse_string_or_char (const char *tokptr, const char **outptr, struct token { - char *operator; + char *oper; int token; enum exp_opcode opcode; }; @@ -1330,7 +1330,7 @@ yylex (void) tokstart = lexptr; /* See if it is a special token of length 3. */ for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++) - if (strncmp (tokstart, tokentab3[i].operator, 3) == 0) + if (strncmp (tokstart, tokentab3[i].oper, 3) == 0) { lexptr += 3; yylval.opcode = tokentab3[i].opcode; @@ -1339,7 +1339,7 @@ yylex (void) /* See if it is a special token of length 2. */ for (i = 0; i < sizeof tokentab2 / sizeof tokentab2[0]; i++) - if (strncmp (tokstart, tokentab2[i].operator, 2) == 0) + if (strncmp (tokstart, tokentab2[i].oper, 2) == 0) { lexptr += 2; yylval.opcode = tokentab2[i].opcode; @@ -1565,7 +1565,7 @@ yylex (void) /* Catch specific keywords. */ copy = copy_name (yylval.sval); for (i = 0; i < sizeof ident_tokens / sizeof ident_tokens[0]; i++) - if (strcmp (copy, ident_tokens[i].operator) == 0) + if (strcmp (copy, ident_tokens[i].oper) == 0) { /* It is ok to always set this, even though we don't always strictly need to. */ -- cgit v1.1