Make the ObjC attributes diagnostics a bit more informative.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@178720 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/clang/Basic/DiagnosticParseKinds.td b/include/clang/Basic/DiagnosticParseKinds.td
index 26820db..04a433c 100644
--- a/include/clang/Basic/DiagnosticParseKinds.td
+++ b/include/clang/Basic/DiagnosticParseKinds.td
@@ -401,6 +401,9 @@
"prefix attribute must be followed by an interface or protocol">;
def err_objc_postfix_attribute : Error <
"postfix attributes are not allowed on Objective-C directives">;
+def err_objc_postfix_attribute_hint : Error <
+ "postfix attributes are not allowed on Objective-C directives, place"
+ " them in front of '%select{@interface|@protocol}0'">;
def err_objc_directive_only_in_protocol : Error<
"directive may only be specified in protocols only">;
def err_missing_catch_finally : Error<
diff --git a/include/clang/Parse/Parser.h b/include/clang/Parse/Parser.h
index 7ff6f96..8cc60a2 100644
--- a/include/clang/Parse/Parser.h
+++ b/include/clang/Parse/Parser.h
@@ -1113,7 +1113,7 @@
ExprResult ParseAsmStringLiteral();
// Objective-C External Declarations
- void MaybeSkipAttributes();
+ void MaybeSkipAttributes(tok::ObjCKeywordKind Kind);
DeclGroupPtrTy ParseObjCAtDirectives();
DeclGroupPtrTy ParseObjCAtClassDeclaration(SourceLocation atLoc);
Decl *ParseObjCAtInterfaceDeclaration(SourceLocation AtLoc,
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp
index 844a3d1..ad95dd5 100644
--- a/lib/Parse/ParseObjc.cpp
+++ b/lib/Parse/ParseObjc.cpp
@@ -23,10 +23,14 @@
using namespace clang;
/// Skips attributes after an Objective-C @ directive. Emits a diagnostic.
-void Parser::MaybeSkipAttributes() {
+void Parser::MaybeSkipAttributes(tok::ObjCKeywordKind Kind) {
ParsedAttributes attrs(AttrFactory);
if (Tok.is(tok::kw___attribute)) {
- Diag(Tok, diag::err_objc_postfix_attribute);
+ if (Kind == tok::objc_interface || Kind == tok::objc_protocol)
+ Diag(Tok, diag::err_objc_postfix_attribute_hint)
+ << (Kind == tok::objc_protocol);
+ else
+ Diag(Tok, diag::err_objc_postfix_attribute);
ParseGNUAttributes(attrs);
}
}
@@ -101,7 +105,7 @@
while (1) {
- MaybeSkipAttributes();
+ MaybeSkipAttributes(tok::objc_class);
if (Tok.isNot(tok::identifier)) {
Diag(Tok, diag::err_expected_ident);
SkipUntil(tok::semi);
@@ -188,7 +192,7 @@
return 0;
}
- MaybeSkipAttributes();
+ MaybeSkipAttributes(tok::objc_interface);
if (Tok.isNot(tok::identifier)) {
Diag(Tok, diag::err_expected_ident); // missing class or category name.
@@ -1408,7 +1412,7 @@
return DeclGroupPtrTy();
}
- MaybeSkipAttributes();
+ MaybeSkipAttributes(tok::objc_protocol);
if (Tok.isNot(tok::identifier)) {
Diag(Tok, diag::err_expected_ident); // missing protocol name.
@@ -1501,7 +1505,7 @@
return DeclGroupPtrTy();
}
- MaybeSkipAttributes();
+ MaybeSkipAttributes(tok::objc_implementation);
if (Tok.isNot(tok::identifier)) {
Diag(Tok, diag::err_expected_ident); // missing class or category name.
diff --git a/test/Parser/attributes.mm b/test/Parser/attributes.mm
index 812d543..d92e3d3 100644
--- a/test/Parser/attributes.mm
+++ b/test/Parser/attributes.mm
@@ -11,15 +11,15 @@
class EXP C {};
EXP class C2 {}; // expected-warning {{attribute 'visibility' is ignored, place it after "class" to apply attribute to type declaration}}
-@interface EXP I @end // expected-error {{postfix attributes are not allowed on Objective-C directives}}
+@interface EXP I @end // expected-error {{postfix attributes are not allowed on Objective-C directives, place them in front of '@interface'}}
EXP @interface I2 @end
-@implementation EXP I @end // expected-error {{postfix attributes are not allowed on Objective-C directives}}
+@implementation EXP I @end // expected-error-re {{postfix attributes are not allowed on Objective-C directives$}}
// FIXME: Prefix attribute recovery skips until ';'
-EXP @implementation I2 @end; // expected-error{{prefix attribute must be followed by an interface or protocol}}
+EXP @implementation I2 @end; // expected-error {{prefix attribute must be followed by an interface or protocol}}
-@class EXP OC; // expected-error {{postfix attributes are not allowed on Objective-C directives}}
+@class EXP OC; // expected-error-re {{postfix attributes are not allowed on Objective-C directives$}}
EXP @class OC2; // expected-error {{prefix attribute must be followed by an interface or protocol}}
-@protocol EXP P @end // expected-error {{postfix attributes are not allowed on Objective-C directives}}
+@protocol EXP P @end // expected-error {{postfix attributes are not allowed on Objective-C directives, place them in front of '@protocol'}}
EXP @protocol P2 @end
