Objective-C/C++ : Improve '@' keyword locations.

When we are lexing tokens for Objective-C, we combine '@' tokens
with a following keyword (when that keyword is a valid Objective-C
one or, for Objective-C, one of the C++ keywords that can appear in
this position).  The responsibility is passed on to the parser to
validate the resulting combination.

The combination of tokens was being done without applying the rule
to their locations - so that we get:

@property
^

instead of what the user might expect:

@property
^~~~~~~~~

This patch combines the source range of the keyword with that of the
'@' sign - which improves diagnostics.

gcc/c-family/ChangeLog:

	* c-lex.c (c_lex_with_flags): When combining '@' with a
	keyword for Objective-C, combine the location ranges too.

diff --git a/gcc/c-family/c-lex.c b/gcc/c-family/c-lex.c
index b1cef2345f491a600eaae4173b05b49e5bdf954b..e81e16ddc26bf1250c8ae5945b270f57863c2fd5 100644 (file)
--- a/gcc/c-family/c-lex.c
+++ b/gcc/c-family/c-lex.c
@@ -550,7 +550,11 @@ c_lex_with_flags (tree *value, location_t *loc, unsigned char *cpp_flags,
                     returning a token of type CPP_AT_NAME and rid
                     code RID_CLASS (not RID_AT_CLASS).  The language
                     parser needs to convert that to RID_AT_CLASS.
+                    However, we've now spliced the '@' together with the
+                    keyword that follows; Adjust the location so that we
+                    get a source range covering the composite.
                  */
+                *loc = make_location (atloc, atloc, newloc);
                  break;
                }
              /* FALLTHROUGH */