commit 7ed9e0f97f4645edc5d4670385b985ea4c617ce7
author Fariborz Jahanian <fjahanian@apple.com> Tue Oct 02 22:05:16 2007 +0000
committer Fariborz Jahanian <fjahanian@apple.com> Tue Oct 02 22:05:16 2007 +0000
tree 793b6ed824b1170877a6ed10b1251b45431da80a
parent a5997c4f36e0f5aa44623a5b1e3b914760d1ec68

Unified such names as protocol references, instance methods and class methods
and their accessors in a variety of objective-c classes.


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

AST/Decl.cpp

diff --git a/AST/Decl.cpp b/AST/Decl.cpp
index 9e02607..8c9638c 100644
--- a/AST/Decl.cpp
+++ b/AST/Decl.cpp
@@ -320,15 +320,15 @@
 				       unsigned numInsMembers,
                                        ObjcMethodDecl **clsMethods,
                                        unsigned numClsMembers) {
-  NumInsMethods = numInsMembers;
+  NumInstanceMethods = numInsMembers;
   if (numInsMembers) {
-    InsMethods = new ObjcMethodDecl*[numInsMembers];
-    memcpy(InsMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
+    InstanceMethods = new ObjcMethodDecl*[numInsMembers];
+    memcpy(InstanceMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
   }
-  NumClsMethods = numClsMembers;
+  NumClassMethods = numClsMembers;
   if (numClsMembers) {
-    ClsMethods = new ObjcMethodDecl*[numClsMembers];
-    memcpy(ClsMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
+    ClassMethods = new ObjcMethodDecl*[numClsMembers];
+    memcpy(ClassMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
   }
 }
 
@@ -339,15 +339,15 @@
 					   unsigned numInsMembers,
 					   ObjcMethodDecl **clsMethods,
 					   unsigned numClsMembers) {
-  NumProtoInsMethods = numInsMembers;
+  NumInstanceMethods = numInsMembers;
   if (numInsMembers) {
-    ProtoInsMethods = new ObjcMethodDecl*[numInsMembers];
-    memcpy(ProtoInsMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
+    InstanceMethods = new ObjcMethodDecl*[numInsMembers];
+    memcpy(InstanceMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
   }
-  NumProtoClsMethods = numClsMembers;
+  NumClassMethods = numClsMembers;
   if (numClsMembers) {
-    ProtoClsMethods = new ObjcMethodDecl*[numClsMembers];
-    memcpy(ProtoClsMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
+    ClassMethods = new ObjcMethodDecl*[numClsMembers];
+    memcpy(ClassMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
   }
 }
 
@@ -358,15 +358,15 @@
 					 unsigned numInsMembers,
 					 ObjcMethodDecl **clsMethods,
 					 unsigned numClsMembers) {
-  NumCatInsMethods = numInsMembers;
+  NumInstanceMethods = numInsMembers;
   if (numInsMembers) {
-    CatInsMethods = new ObjcMethodDecl*[numInsMembers];
-    memcpy(CatInsMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
+    InstanceMethods = new ObjcMethodDecl*[numInsMembers];
+    memcpy(InstanceMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
   }
-  NumCatClsMethods = numClsMembers;
+  NumClassMethods = numClsMembers;
   if (numClsMembers) {
-    CatClsMethods = new ObjcMethodDecl*[numClsMembers];
-    memcpy(CatClsMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
+    ClassMethods = new ObjcMethodDecl*[numClsMembers];
+    memcpy(ClassMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
   }
 }
 
@@ -377,15 +377,15 @@
 						 unsigned numInsMembers,
 						 ObjcMethodDecl **clsMethods,
 						 unsigned numClsMembers) {
-  NumCatInsMethods = numInsMembers;
+  NumInstanceMethods = numInsMembers;
   if (numInsMembers) {
-    CatInsMethods = new ObjcMethodDecl*[numInsMembers];
-    memcpy(CatInsMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
+    InstanceMethods = new ObjcMethodDecl*[numInsMembers];
+    memcpy(InstanceMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
   }
-  NumCatClsMethods = numClsMembers;
+  NumClassMethods = numClsMembers;
   if (numClsMembers) {
-    CatClsMethods = new ObjcMethodDecl*[numClsMembers];
-    memcpy(CatClsMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
+    ClassMethods = new ObjcMethodDecl*[numClsMembers];
+    memcpy(ClassMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
   }
 }
 
@@ -396,15 +396,15 @@
 						unsigned numInsMembers,
 						ObjcMethodDecl **clsMethods,
 						unsigned numClsMembers) {
-  NumInsMethods = numInsMembers;
+  NumInstanceMethods = numInsMembers;
   if (numInsMembers) {
-    InsMethods = new ObjcMethodDecl*[numInsMembers];
-    memcpy(InsMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
+    InstanceMethods = new ObjcMethodDecl*[numInsMembers];
+    memcpy(InstanceMethods, insMethods, numInsMembers*sizeof(ObjcMethodDecl*));
   }
-  NumClsMethods = numClsMembers;
+  NumClassMethods = numClsMembers;
   if (numClsMembers) {
-    ClsMethods = new ObjcMethodDecl*[numClsMembers];
-    memcpy(ClsMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
+    ClassMethods = new ObjcMethodDecl*[numClsMembers];
+    memcpy(ClassMethods, clsMethods, numClsMembers*sizeof(ObjcMethodDecl*));
   }
 }
 
@@ -412,8 +412,8 @@
 ObjcMethodDecl *ObjcInterfaceDecl::lookupInstanceMethod(Selector &Sel) {
   ObjcInterfaceDecl* ClassDecl = this;
   while (ClassDecl != NULL) {
-    ObjcMethodDecl **methods = ClassDecl->getInsMethods();
-    int methodCount = ClassDecl->getNumInsMethods();
+    ObjcMethodDecl **methods = ClassDecl->getInstanceMethods();
+    int methodCount = ClassDecl->getNumInstanceMethods();
     for (int i = 0; i < methodCount; ++i) {
       if (methods[i]->getSelector() == Sel) {
         return methods[i];
@@ -428,8 +428,8 @@
 ObjcMethodDecl *ObjcInterfaceDecl::lookupClassMethod(Selector &Sel) {
   ObjcInterfaceDecl* ClassDecl = this;
   while (ClassDecl != NULL) {
-    ObjcMethodDecl **methods = ClassDecl->getClsMethods();
-    int methodCount = ClassDecl->getNumClsMethods();
+    ObjcMethodDecl **methods = ClassDecl->getClassMethods();
+    int methodCount = ClassDecl->getNumClassMethods();
     for (int i = 0; i < methodCount; ++i) {
       if (methods[i]->getSelector() == Sel) {
         return methods[i];