diff options
| -rw-r--r-- | Driver/PrintParserCallbacks.cpp | 2 | ||||
| -rw-r--r-- | include/clang/Parse/Action.h | 2 | ||||
| -rw-r--r-- | lib/Parse/ParseObjc.cpp | 2 | ||||
| -rw-r--r-- | lib/Sema/Sema.h | 2 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Driver/PrintParserCallbacks.cpp b/Driver/PrintParserCallbacks.cpp index e3850bab56..bc28db525b 100644 --- a/Driver/PrintParserCallbacks.cpp +++ b/Driver/PrintParserCallbacks.cpp @@ -134,7 +134,7 @@ namespace { return 0; } - virtual void ObjCActOnStartOfMethodDef(Scope *FnBodyScope, DeclTy *D) { + virtual void ActOnStartOfObjCMethodDef(Scope *FnBodyScope, DeclTy *D) { llvm::cout << __FUNCTION__ << "\n"; } diff --git a/include/clang/Parse/Action.h b/include/clang/Parse/Action.h index a7f2e767b3..9b4e9802dc 100644 --- a/include/clang/Parse/Action.h +++ b/include/clang/Parse/Action.h @@ -262,7 +262,7 @@ public: return D; } - virtual void ObjCActOnStartOfMethodDef(Scope *FnBodyScope, DeclTy *D) { + virtual void ActOnStartOfObjCMethodDef(Scope *FnBodyScope, DeclTy *D) { return; } diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 4ddddb3749..3aa525b796 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -1377,7 +1377,7 @@ Parser::DeclTy *Parser::ParseObjCMethodDefinition() { // Tell the actions module that we have entered a method definition with the // specified Declarator for the method. - Actions.ObjCActOnStartOfMethodDef(CurScope, MDecl); + Actions.ActOnStartOfObjCMethodDef(CurScope, MDecl); OwningStmtResult FnBody(ParseCompoundStatementBody()); diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h index 1b6d6c1406..ead93cb749 100644 --- a/lib/Sema/Sema.h +++ b/lib/Sema/Sema.h @@ -295,7 +295,7 @@ public: virtual void ActOnFinishKNRParamDeclarations(Scope *S, Declarator &D); virtual DeclTy *ActOnStartOfFunctionDef(Scope *S, Declarator &D); virtual DeclTy *ActOnStartOfFunctionDef(Scope *S, DeclTy *D); - virtual void ObjCActOnStartOfMethodDef(Scope *S, DeclTy *D); + virtual void ActOnStartOfObjCMethodDef(Scope *S, DeclTy *D); virtual DeclTy *ActOnFinishFunctionBody(DeclTy *Decl, StmtArg Body); virtual DeclTy *ActOnFileScopeAsmDecl(SourceLocation Loc, ExprArg expr); diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index cc86786255..654891d5ab 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -17,9 +17,9 @@ #include "clang/Parse/DeclSpec.h" using namespace clang; -/// ObjCActOnStartOfMethodDef - This routine sets up parameters; invisible +/// ActOnStartOfObjCMethodDef - This routine sets up parameters; invisible /// and user declared, in the method definition's AST. -void Sema::ObjCActOnStartOfMethodDef(Scope *FnBodyScope, DeclTy *D) { +void Sema::ActOnStartOfObjCMethodDef(Scope *FnBodyScope, DeclTy *D) { assert(getCurMethodDecl() == 0 && "Method parsing confused"); ObjCMethodDecl *MDecl = dyn_cast_or_null<ObjCMethodDecl>((Decl *)D); |