Patchwork =?UTF-8?Q?ObjC=20patch=20-=20do=20not=20replace=20token->value=20with=20?= =?UTF-8?Q?canonical=20spelling?=

login
register
mail settings
Submitter Nicola Pero
Date Sept. 21, 2010, 10:31 p.m.
Message ID <1285108272.842724847@192.168.2.228>
Download mbox | patch
Permalink /patch/65386/
State New
Headers show

Comments

Nicola Pero - Sept. 21, 2010, 10:31 p.m.
This one-liner patch removes a difference between the Objective-C 
and C/C++/Objective-C++ parsers (it's the first of a set of patches 
- this tiny difference prevents me from moving code around in more 
interesting patches later, so I want to get it out of the way first) ;-)

No regressions.  Ok to apply ?

Thanks
Mike Stump - Sept. 28, 2010, 7:45 p.m.
On Sep 21, 2010, at 3:31 PM, Nicola Pero wrote:
> This one-liner patch removes a difference between the Objective-C 
> and C/C++/Objective-C++ parsers (it's the first of a set of patches 
> - this tiny difference prevents me from moving code around in more 
> interesting patches later, so I want to get it out of the way first) ;-)
> 
> No regressions.  Ok to apply ?

Ok.  I know what happened, saw c-parser.c and left it to the c people...  :-)

Patch

Index: gcc/ChangeLog
===================================================================
--- gcc/ChangeLog       (revision 164498)
+++ gcc/ChangeLog       (working copy)
@@ -1,3 +1,9 @@ 
+2010-09-21  Nicola Pero  <nicola.pero@meta-innovation.com>
+
+       * c-parser.c (c_lex_one_token): In Objective-C, do not replace
+       token->value with the canonical spelling.  Do exactly like C and
+       C++ and leave it as it is.
+
 2010-09-21  Anatoly Sokolov  <aesok@post.ru>
 
        * config/rs6000/rs6000.h (OUTPUT_ADDR_CONST_EXTRA): Remove macros.
Index: gcc/c-parser.c
===================================================================
--- gcc/c-parser.c      (revision 164498)
+++ gcc/c-parser.c      (working copy)
@@ -242,8 +242,6 @@  c_lex_one_token (c_parser *parser, c_token *token)
                    && (!OBJC_IS_PQ_KEYWORD (rid_code)
                        || parser->objc_pq_context))
                  {
-                   /* Return the canonical spelling for this keyword.  */
-                   token->value = ridpointers[(int) rid_code];
                    token->type = CPP_KEYWORD;
                    token->keyword = rid_code;
                    break;