From: Ted Kremenek Date: Wed, 17 Feb 2010 02:37:45 +0000 (+0000) Subject: Add IBAction attribute to keep the IBOutlet attribute company. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=efbddd23173ea5633cc8a004f1014c68c3ac6593;p=clang Add IBAction attribute to keep the IBOutlet attribute company. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@96447 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/AST/Attr.h b/include/clang/AST/Attr.h index 37225907c6..10999cb467 100644 --- a/include/clang/AST/Attr.h +++ b/include/clang/AST/Attr.h @@ -62,7 +62,8 @@ public: FormatArg, GNUInline, Hiding, - IBOutletKind, // Clang-specific. Use "Kind" suffix to not conflict with + IBOutletKind, // Clang-specific. Use "Kind" suffix to not conflict w/ macro. + IBActionKind, // Clang-specific. Use "Kind" suffix to not conflict w/ macro. Malloc, NoDebug, NoInline, @@ -326,6 +327,19 @@ public: static bool classof(const IBOutletAttr *A) { return true; } }; +class IBActionAttr : public Attr { +public: + IBActionAttr() : Attr(IBActionKind) {} + + virtual Attr *clone(ASTContext &C) const; + + // Implement isa/cast/dyncast/etc. + static bool classof(const Attr *A) { + return A->getKind() == IBActionKind; + } + static bool classof(const IBActionAttr *A) { return true; } +}; + DEF_SIMPLE_ATTR(Malloc); DEF_SIMPLE_ATTR(NoReturn); DEF_SIMPLE_ATTR(AnalyzerNoReturn); diff --git a/include/clang/Basic/DiagnosticSemaKinds.td b/include/clang/Basic/DiagnosticSemaKinds.td index e2912ea351..0ae68beac8 100644 --- a/include/clang/Basic/DiagnosticSemaKinds.td +++ b/include/clang/Basic/DiagnosticSemaKinds.td @@ -846,8 +846,8 @@ def err_attribute_regparm_invalid_number : Error< // Clang-Specific Attributes -def err_attribute_iboutlet : Error< - "'iboutlet' attribute can only be applied to instance variables or " +def err_attribute_ib : Error< + "%0 attribute can only be applied to instance variables or " "properties">; def err_attribute_overloadable_not_function : Error< "'overloadable' attribute can only be applied to a function">; diff --git a/include/clang/Parse/AttributeList.h b/include/clang/Parse/AttributeList.h index ecaa6aee47..eab773e412 100644 --- a/include/clang/Parse/AttributeList.h +++ b/include/clang/Parse/AttributeList.h @@ -51,7 +51,8 @@ public: AttributeList *Next, bool declspec = false, bool cxx0x = false); ~AttributeList(); - enum Kind { // Please keep this list alphabetized. + enum Kind { // Please keep this list alphabetized. + AT_IBAction, // Clang-specific. AT_IBOutlet, // Clang-specific. AT_address_space, AT_alias, diff --git a/lib/AST/AttrImpl.cpp b/lib/AST/AttrImpl.cpp index d81979734b..dd6e3564a5 100644 --- a/lib/AST/AttrImpl.cpp +++ b/lib/AST/AttrImpl.cpp @@ -139,6 +139,10 @@ Attr *IBOutletAttr::clone(ASTContext &C) const { return ::new (C) IBOutletAttr; } +Attr *IBActionAttr::clone(ASTContext &C) const { + return ::new (C) IBActionAttr; +} + Attr *GNUInlineAttr::clone(ASTContext &C) const { return ::new (C) GNUInlineAttr; } diff --git a/lib/Frontend/PCHReaderDecl.cpp b/lib/Frontend/PCHReaderDecl.cpp index 625997cac2..f47a60f260 100644 --- a/lib/Frontend/PCHReaderDecl.cpp +++ b/lib/Frontend/PCHReaderDecl.cpp @@ -517,6 +517,10 @@ Attr *PCHReader::ReadAttributes() { SIMPLE_ATTR(GNUInline); SIMPLE_ATTR(Hiding); + case Attr::IBActionKind: + New = ::new (*Context) IBActionAttr(); + break; + case Attr::IBOutletKind: New = ::new (*Context) IBOutletAttr(); break; diff --git a/lib/Frontend/PCHWriter.cpp b/lib/Frontend/PCHWriter.cpp index 4c99dbe245..bd6463128b 100644 --- a/lib/Frontend/PCHWriter.cpp +++ b/lib/Frontend/PCHWriter.cpp @@ -1853,6 +1853,7 @@ void PCHWriter::WriteAttributeRecord(const Attr *Attr) { case Attr::GNUInline: case Attr::Hiding: case Attr::IBOutletKind: + case Attr::IBActionKind: case Attr::Malloc: case Attr::NoDebug: case Attr::NoReturn: diff --git a/lib/Parse/AttributeList.cpp b/lib/Parse/AttributeList.cpp index df48e3a786..2321f1acb9 100644 --- a/lib/Parse/AttributeList.cpp +++ b/lib/Parse/AttributeList.cpp @@ -82,6 +82,7 @@ AttributeList::Kind AttributeList::getKind(const IdentifierInfo *Name) { .Case("stdcall", AT_stdcall) .Case("annotate", AT_annotate) .Case("fastcall", AT_fastcall) + .Case("ibaction", AT_IBAction) .Case("iboutlet", AT_IBOutlet) .Case("noreturn", AT_noreturn) .Case("noinline", AT_noinline) diff --git a/lib/Sema/SemaDeclAttr.cpp b/lib/Sema/SemaDeclAttr.cpp index 02b2aa21b7..e0943274da 100644 --- a/lib/Sema/SemaDeclAttr.cpp +++ b/lib/Sema/SemaDeclAttr.cpp @@ -225,19 +225,29 @@ static void HandlePackedAttr(Decl *d, const AttributeList &Attr, Sema &S) { S.Diag(Attr.getLoc(), diag::warn_attribute_ignored) << Attr.getName(); } -static void HandleIBOutletAttr(Decl *d, const AttributeList &Attr, Sema &S) { +static void HandleIBAttr(Decl *d, const AttributeList &Attr, Sema &S) { // check the attribute arguments. if (Attr.getNumArgs() > 0) { S.Diag(Attr.getLoc(), diag::err_attribute_wrong_number_arguments) << 0; return; } - // The IBOutlet attribute only applies to instance variables of Objective-C - // classes. - if (isa(d) || isa(d)) - d->addAttr(::new (S.Context) IBOutletAttr()); + // The IBOutlet/IBAction attributes only apply to instance variables of + // Objective-C classes. + if (isa(d) || isa(d)) { + switch (Attr.getKind()) { + case AttributeList::AT_IBAction: + d->addAttr(::new (S.Context) IBActionAttr()); + break; + case AttributeList::AT_IBOutlet: + d->addAttr(::new (S.Context) IBOutletAttr()); + break; + default: + llvm_unreachable("Invalid IB attribute"); + } + } else - S.Diag(Attr.getLoc(), diag::err_attribute_iboutlet); + S.Diag(Attr.getLoc(), diag::err_attribute_ib) << Attr.getName(); } static void HandleNonNullAttr(Decl *d, const AttributeList &Attr, Sema &S) { @@ -1729,7 +1739,8 @@ static void ProcessDeclAttribute(Scope *scope, Decl *D, // FIXME: Try to deal with other __declspec attributes! return; switch (Attr.getKind()) { - case AttributeList::AT_IBOutlet: HandleIBOutletAttr (D, Attr, S); break; + case AttributeList::AT_IBAction: + case AttributeList::AT_IBOutlet: HandleIBAttr (D, Attr, S); break; case AttributeList::AT_address_space: case AttributeList::AT_objc_gc: case AttributeList::AT_vector_size: