Rename several ObjC action methods to use the "ActOn" prefix (still a few more to do).
Remove Action::ObjCStartCategoryInterface/ObjCFinishInterface - they are unused.
.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@42559 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Parse/MinimalAction.cpp b/Parse/MinimalAction.cpp
index d9fc5c5..dc0a9cc 100644
--- a/Parse/MinimalAction.cpp
+++ b/Parse/MinimalAction.cpp
@@ -93,10 +93,10 @@
return 0;
}
-/// ObjcClassDeclaration -
+/// ActOnForwardClassDeclaration -
/// Scope will always be top level file scope.
Action::DeclTy *
-MinimalAction::ObjcClassDeclaration(Scope *S, SourceLocation AtClassLoc,
+MinimalAction::ActOnForwardClassDeclaration(Scope *S, SourceLocation AtClassLoc,
IdentifierInfo **IdentList, unsigned NumElts) {
for (unsigned i = 0; i != NumElts; ++i) {
TypeNameInfo *TI =
@@ -110,11 +110,11 @@
return 0;
}
-/// ObjcForwardProtocolDeclaration -
+/// ActOnForwardProtocolDeclaration -
/// Scope will always be top level file scope.
Action::DeclTy *
-MinimalAction::ObjcForwardProtocolDeclaration(Scope *S, SourceLocation AtClassLoc,
- IdentifierInfo **IdentList, unsigned NumElts) {
+MinimalAction::ActOnForwardProtocolDeclaration(Scope *S,
+ SourceLocation AtClassLoc, IdentifierInfo **IdentList, unsigned NumElts) {
for (unsigned i = 0; i != NumElts; ++i) {
TypeNameInfo *TI =
new TypeNameInfo(1, IdentList[i]->getFETokenInfo<TypeNameInfo>());
diff --git a/Parse/ParseObjc.cpp b/Parse/ParseObjc.cpp
index cda2ab5..eaf198f 100644
--- a/Parse/ParseObjc.cpp
+++ b/Parse/ParseObjc.cpp
@@ -80,7 +80,7 @@
if (ExpectAndConsume(tok::semi, diag::err_expected_semi_after, "@class"))
return 0;
- return Actions.ObjcClassDeclaration(CurScope, atLoc,
+ return Actions.ActOnForwardClassDeclaration(CurScope, atLoc,
&ClassNames[0], ClassNames.size());
}
@@ -684,9 +684,9 @@
methodAttrs = ParseAttributes();
Selector Sel = ObjcGetKeywordSelector(KeyIdents);
- return Actions.ObjcBuildMethodDeclaration(mLoc, mType, ReturnType, Sel,
- &KeyTypes[0], &ArgNames[0],
- methodAttrs, MethodImplKind);
+ return Actions.ActOnMethodDeclaration(mLoc, mType, ReturnType, Sel,
+ &KeyTypes[0], &ArgNames[0],
+ methodAttrs, MethodImplKind);
} else if (!selIdent) {
Diag(Tok, diag::err_expected_ident); // missing selector name.
}
@@ -695,8 +695,8 @@
methodAttrs = ParseAttributes();
Selector Sel = ObjcGetUnarySelector(selIdent);
- return Actions.ObjcBuildMethodDeclaration(mLoc, mType, ReturnType, Sel,
- 0, 0, methodAttrs, MethodImplKind);
+ return Actions.ActOnMethodDeclaration(mLoc, mType, ReturnType, Sel,
+ 0, 0, methodAttrs, MethodImplKind);
}
/// objc-protocol-refs:
@@ -866,9 +866,9 @@
return 0;
}
if (ProtocolRefs.size() > 0)
- return Actions.ObjcForwardProtocolDeclaration(CurScope, AtLoc,
- &ProtocolRefs[0],
- ProtocolRefs.size());
+ return Actions.ActOnForwardProtocolDeclaration(CurScope, AtLoc,
+ &ProtocolRefs[0],
+ ProtocolRefs.size());
// Last, and definitely not least, parse a protocol declaration.
if (Tok.getKind() == tok::less) {
if (ParseObjCProtocolReferences(ProtocolRefs))