Minor name change (move the ObjC prefix to a more appropriate place).

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

diff --git a/Driver/PrintParserCallbacks.cpp b/Driver/PrintParserCallbacks.cpp
index e3850bab56c78634e036b500fe4bda21ec9cc24f..bc28db525b1c9257bb005b237e24dc252ce5016e 100644 (file)
--- 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 a7f2e767b3f72d069cce31e37cb89277f8119eaf..9b4e9802dcb3c5ed97518c9d8924657357b3cced 100644 (file)
--- 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 4ddddb3749b143df158975b1a5815cb10bbe6e45..3aa525b796ddd3045429e8cbd528a7af364fdd8c 100644 (file)
--- 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 1b6d6c14065af7bab65c44bca5ea522f2fc268b8..ead93cb7494c851b98b5503f9e638f46bf63ab45 100644 (file)
--- 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 cc867862552379e870c7622b886cba993a1b152d..654891d5ab5cc23d9a46b58491687674dd203d58 100644 (file)
--- 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);