public inbox for archer-commits@sourceware.org
help / color / mirror / Atom feed
* [SCM]  archer-ratmice-compile-Wc++-compat: rename all "operator" identifiers
@ 2010-09-15 14:20 tromey
  0 siblings, 0 replies; only message in thread
From: tromey @ 2010-09-15 14:20 UTC (permalink / raw)
  To: archer-commits

The branch, archer-ratmice-compile-Wc++-compat has been updated
       via  0a1ac825eb17e3ee78b547548b17e44482288626 (commit)
      from  da33d04221737fcb7761118dcf5795ac7ee947b9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit 0a1ac825eb17e3ee78b547548b17e44482288626
Author: Tom Tromey <tromey@redhat.com>
Date:   Wed Sep 15 08:20:43 2010 -0600

    rename all "operator" identifiers

-----------------------------------------------------------------------

Summary of changes:
 gdb/c-exp.y    |    8 ++++----
 gdb/f-exp.y    |   18 +++++++++---------
 gdb/jv-exp.y   |    6 +++---
 gdb/objc-exp.y |    6 +++---
 gdb/p-exp.y    |   10 +++++-----
 5 files changed, 24 insertions(+), 24 deletions(-)

First 500 lines of diff:
diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index f337d67..f1f10e4 100644
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1821,7 +1821,7 @@ parse_string_or_char (char *tokptr, char **outptr, struct typed_stoken *value,
 
 struct token
 {
-  char *operator;
+  char *operator_name;
   int token;
   enum exp_opcode opcode;
   int cxx_only;
@@ -2034,7 +2034,7 @@ lex_one_token (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].operator_name, 3) == 0)
       {
 	if (tokentab3[i].cxx_only
 	    && parse_language->la_language != language_cplus)
@@ -2047,7 +2047,7 @@ lex_one_token (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].operator_name, 2) == 0)
       {
 	if (tokentab2[i].cxx_only
 	    && parse_language->la_language != language_cplus)
@@ -2307,7 +2307,7 @@ lex_one_token (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].operator_name) == 0)
       {
 	if (ident_tokens[i].cxx_only
 	    && parse_language->la_language != language_cplus)
diff --git a/gdb/f-exp.y b/gdb/f-exp.y
index 415819a..98452d2 100644
--- a/gdb/f-exp.y
+++ b/gdb/f-exp.y
@@ -806,7 +806,7 @@ parse_number (p, len, parsed_float, putithere)
 
 struct token
 {
-  char *operator;
+  char *operator_name;
   int token;
   enum exp_opcode opcode;
 };
@@ -981,12 +981,12 @@ yylex ()
 	}
     }
   
-  /* See if it is a special .foo. operator.  */
+  /* See if it is a special .foo. operator_name.  */
   
-  for (i = 0; dot_ops[i].operator != NULL; i++)
-    if (strncmp (tokstart, dot_ops[i].operator, strlen (dot_ops[i].operator)) == 0)
+  for (i = 0; dot_ops[i].operator_name != NULL; i++)
+    if (strncmp (tokstart, dot_ops[i].operator_name, strlen (dot_ops[i].operator_name)) == 0)
       {
-	lexptr += strlen (dot_ops[i].operator);
+	lexptr += strlen (dot_ops[i].operator_name);
 	yylval.opcode = dot_ops[i].opcode;
 	return dot_ops[i].token;
       }
@@ -1149,11 +1149,11 @@ yylex ()
   
   /* Catch specific keywords.  */
   
-  for (i = 0; f77_keywords[i].operator != NULL; i++)
-    if (strncmp (tokstart, f77_keywords[i].operator,
-		 strlen(f77_keywords[i].operator)) == 0)
+  for (i = 0; f77_keywords[i].operator_name != NULL; i++)
+    if (strncmp (tokstart, f77_keywords[i].operator_name,
+		 strlen(f77_keywords[i].operator_name)) == 0)
       {
-	/* 	lexptr += strlen(f77_keywords[i].operator); */ 
+	/* 	lexptr += strlen(f77_keywords[i].operator_name); */ 
 	yylval.opcode = f77_keywords[i].opcode;
 	return f77_keywords[i].token;
       }
diff --git a/gdb/jv-exp.y b/gdb/jv-exp.y
index 8109e0c..73ed91c 100644
--- a/gdb/jv-exp.y
+++ b/gdb/jv-exp.y
@@ -809,7 +809,7 @@ parse_number (char *p, int len, int parsed_float, YYSTYPE *putithere)
 
 struct token
 {
-  char *operator;
+  char *operator_name;
   int token;
   enum exp_opcode opcode;
 };
@@ -863,7 +863,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].operator_name, 3) == 0)
       {
 	lexptr += 3;
 	yylval.opcode = tokentab3[i].opcode;
@@ -872,7 +872,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].operator_name, 2) == 0)
       {
 	lexptr += 2;
 	yylval.opcode = tokentab2[i].opcode;
diff --git a/gdb/objc-exp.y b/gdb/objc-exp.y
index 7736580..1d18d9b 100644
--- a/gdb/objc-exp.y
+++ b/gdb/objc-exp.y
@@ -1187,7 +1187,7 @@ parse_number (p, len, parsed_float, putithere)
 
 struct token
 {
-  char *operator;
+  char *operator_name;
   int token;
   enum exp_opcode opcode;
 };
@@ -1241,7 +1241,7 @@ yylex ()
   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].operator_name, 3) == 0)
       {
 	lexptr += 3;
 	yylval.opcode = tokentab3[i].opcode;
@@ -1250,7 +1250,7 @@ yylex ()
 
   /* 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].operator_name, 2) == 0)
       {
 	lexptr += 2;
 	yylval.opcode = tokentab2[i].opcode;
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index aed08bc..0a63d18 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -1032,7 +1032,7 @@ pop_current_type (void)
 
 struct token
 {
-  char *operator;
+  char *operator_name;
   int token;
   enum exp_opcode opcode;
 };
@@ -1102,8 +1102,8 @@ yylex ()
   /* See if it is a special token of length 3.  */
   if (explen > 2)
     for (i = 0; i < sizeof (tokentab3) / sizeof (tokentab3[0]); i++)
-      if (strncasecmp (tokstart, tokentab3[i].operator, 3) == 0
-          && (!isalpha (tokentab3[i].operator[0]) || explen == 3
+      if (strncasecmp (tokstart, tokentab3[i].operator_name, 3) == 0
+          && (!isalpha (tokentab3[i].operator_name[0]) || explen == 3
               || (!isalpha (tokstart[3]) && !isdigit (tokstart[3]) && tokstart[3] != '_')))
         {
           lexptr += 3;
@@ -1114,8 +1114,8 @@ yylex ()
   /* See if it is a special token of length 2.  */
   if (explen > 1)
   for (i = 0; i < sizeof (tokentab2) / sizeof (tokentab2[0]); i++)
-      if (strncasecmp (tokstart, tokentab2[i].operator, 2) == 0
-          && (!isalpha (tokentab2[i].operator[0]) || explen == 2
+      if (strncasecmp (tokstart, tokentab2[i].operator_name, 2) == 0
+          && (!isalpha (tokentab2[i].operator_name[0]) || explen == 2
               || (!isalpha (tokstart[2]) && !isdigit (tokstart[2]) && tokstart[2] != '_')))
         {
           lexptr += 2;


hooks/post-receive
--
Repository for Project Archer.


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2010-09-15 14:20 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-09-15 14:20 [SCM] archer-ratmice-compile-Wc++-compat: rename all "operator" identifiers tromey

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).