change the 'invalid token after top level declarator' message to be

'expected ';' after top level declarator' which is much less vague.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@108106 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td
index 63bd3f65a91face4bf4f657c6cdb736c653f6572..ca761f9bf5e9b9d7bed8283ff295cba780a5847d 100644 (file)
--- a/include/clang/Basic/DiagnosticParseKinds.td
+++ b/include/clang/Basic/DiagnosticParseKinds.td
@@ -106,7 +106,7 @@ def err_expected_fn_body : Error<
   "expected function body after function declarator">;
 def err_expected_method_body : Error<"expected method body">;
 def err_invalid_token_after_toplevel_declarator : Error<
-  "invalid token after top level declarator">;
+  "expected ';' after top level declarator">;
 def err_expected_statement : Error<"expected statement">;
 def err_expected_lparen_after : Error<"expected '(' after '%0'">;
 def err_expected_lparen_after_id : Error<"expected '(' after %0">;

diff --git a/test/Lexer/block_cmt_end.c b/test/Lexer/block_cmt_end.c
index 72bc836a0ef0cb1b2c3067f9891339eea422851a..b03fb23f8eeb4c413ae9e3a82c9c08891f26b9ba 100644 (file)
--- a/test/Lexer/block_cmt_end.c
+++ b/test/Lexer/block_cmt_end.c
@@ -17,7 +17,7 @@ next comment ends with normal escaped newline:
 /* expected-warning {{escaped newline}} expected-warning {{backslash and newline}}  *\  
 /
 
-int bar /* expected-error {{invalid token after top level declarator}} */
+int bar /* expected-error {{expected ';' after top level declarator}} */
 
 /* xyz
 

diff --git a/test/Parser/declarators.c b/test/Parser/declarators.c
index 0e6f8bcf28f93dae1f557b89e1a9d1bf57e743b6..fb69fa9c1d05a71223eb0435ede09833e9f949cf 100644 (file)
--- a/test/Parser/declarators.c
+++ b/test/Parser/declarators.c
@@ -90,7 +90,7 @@ struct X<foo::int> { }; // expected-error{{expected identifier or '('}}
 
 // PR7617 - error recovery on missing ;.
 
-void test14()  // expected-error {{invalid token after top level declarator}}
+void test14()  // expected-error {{expected ';' after top level declarator}}
 
 void test14a();
 void *test14b = (void*)test14a; // Make sure test14a didn't get skipped.