Re: [RFA] Token cleanup in c-exp.y

[Keith Seitz <keiths@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 934 bytes --]

On 08/25/2009 08:45 AM, Tom Tromey wrote:
>>>>>> "Keith" == Keith Seitz<keiths@redhat.com>  writes:
>
> Keith>  +    {".*", DOT_STAR, BINOP_END, 0}
>
> After reading the follow-up comments I realized that this needs a couple
> little changes.
>
> The last field should be 1 here, and then the tokentab2 and tokentab3
> logic in yylex needs the same cxx_only treatment as ident_tokens.

Yes, indeed. I've fixed that

> I suppose that the "::" operator also needs to be C++-only.

I don't think we can do that. "::" is also used by gdb for non-language 
constructs like filename::function and function::variable. There are 
several scattered tests on this already.

New patch attached.

Keith

2009-08-25  Keith Seitz  <keiths@redhat.com>

	* c-exp.y (tokentab3): Add new token, ARROW_STAR. Changed all users.
	(tokentab2): Add new token, DOT_STAR. Changed all users.
	(yylex): Add cxx_only check for tokentab2 and tokentab3 searches.


[-- Attachment #2: token-fix2.patch --]
[-- Type: text/plain, Size: 1659 bytes --]

Index: c-exp.y
===================================================================
RCS file: /cvs/src/src/gdb/c-exp.y,v
retrieving revision 1.60
diff -u -p -r1.60 c-exp.y
--- c-exp.y	25 Aug 2009 00:23:07 -0000	1.60
+++ c-exp.y	25 Aug 2009 17:35:52 -0000
@@ -1683,6 +1683,8 @@ static const struct token tokentab2[] =
     {"->", ARROW, BINOP_END, 0},
     {"&&", ANDAND, BINOP_END, 0},
     {"||", OROR, BINOP_END, 0},
+    /* "::" is *not* only C++: gdb overrides its meaning in several
+       different ways, e.g., 'filename'::func, function::variable.  */
     {"::", COLONCOLON, BINOP_END, 0},
     {"<<", LSH, BINOP_END, 0},
     {">>", RSH, BINOP_END, 0},
@@ -1690,7 +1692,7 @@ static const struct token tokentab2[] =
     {"!=", NOTEQUAL, BINOP_END, 0},
     {"<=", LEQ, BINOP_END, 0},
     {">=", GEQ, BINOP_END, 0},
-    {".*", DOT_STAR, BINOP_END, 0}
+    {".*", DOT_STAR, BINOP_END, 1}
   };
 
 /* Identifier-like tokens.  */
@@ -1849,6 +1851,10 @@ yylex (void)
   for (i = 0; i < sizeof tokentab3 / sizeof tokentab3[0]; i++)
     if (strncmp (tokstart, tokentab3[i].operator, 3) == 0)
       {
+	if (tokentab3[i].cxx_only
+	    && parse_language->la_language != language_cplus)
+	  break;
+
 	lexptr += 3;
 	yylval.opcode = tokentab3[i].opcode;
 	return tokentab3[i].token;
@@ -1858,6 +1864,10 @@ yylex (void)
   for (i = 0; i < sizeof tokentab2 / sizeof tokentab2[0]; i++)
     if (strncmp (tokstart, tokentab2[i].operator, 2) == 0)
       {
+	if (tokentab2[i].cxx_only
+	    && parse_language->la_language != language_cplus)
+	  break;
+
 	lexptr += 2;
 	yylval.opcode = tokentab2[i].opcode;
 	if (in_parse_field && tokentab2[i].token == ARROW)