diff options
author | Chris Lattner <sabre@nondot.org> | 2009-02-16 19:25:52 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2009-02-16 19:25:52 +0000 |
commit | bdbde4db74ea9751e02081d720f415eae9718662 (patch) | |
tree | 097162421889bc405ee3df6ed065feb7545fad38 | |
parent | d6eed1cb06016d2e41f9dba4b794f52696415eec (diff) |
code cleanup
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64651 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lib/Sema/SemaDeclObjC.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp index 191ac4b2d4..dc8ce062f0 100644 --- a/lib/Sema/SemaDeclObjC.cpp +++ b/lib/Sema/SemaDeclObjC.cpp @@ -15,7 +15,6 @@ #include "clang/AST/ASTContext.h" #include "clang/AST/DeclObjC.h" #include "clang/Parse/DeclSpec.h" - using namespace clang; /// ObjCActOnStartOfMethodDef - This routine sets up parameters; invisible @@ -49,8 +48,7 @@ void Sema::ObjCActOnStartOfMethodDef(Scope *FnBodyScope, DeclTy *D) { // Introduce all of the other parameters into this scope. for (unsigned i = 0, e = MDecl->getNumParams(); i != e; ++i) { ParmVarDecl *PDecl = MDecl->getParamDecl(i); - IdentifierInfo *II = PDecl->getIdentifier(); - if (II) + if (IdentifierInfo *II = PDecl->getIdentifier()) PushOnScopeChains(PDecl, FnBodyScope); } } @@ -814,20 +812,22 @@ void Sema::ImplMethodsVsClassMethods(ObjCImplementationDecl* IMPDecl, bool IncompleteImpl = false; for (ObjCInterfaceDecl::instmeth_iterator I = IDecl->instmeth_begin(), - E = IDecl->instmeth_end(); I != E; ++I) - if (!(*I)->isSynthesized() && !InsMap.count((*I)->getSelector())) + E = IDecl->instmeth_end(); I != E; ++I) { + if (!(*I)->isSynthesized() && !InsMap.count((*I)->getSelector())) { WarnUndefinedMethod(IMPDecl->getLocation(), *I, IncompleteImpl); - else { - ObjCMethodDecl *ImpMethodDecl = - IMPDecl->getInstanceMethod((*I)->getSelector()); - ObjCMethodDecl *IntfMethodDecl = - IDecl->getInstanceMethod((*I)->getSelector()); - assert(IntfMethodDecl && - "IntfMethodDecl is null in ImplMethodsVsClassMethods"); - // ImpMethodDecl may be null as in a @dynamic property. - if (ImpMethodDecl) - WarnConflictingTypedMethods(ImpMethodDecl, IntfMethodDecl); + continue; } + + ObjCMethodDecl *ImpMethodDecl = + IMPDecl->getInstanceMethod((*I)->getSelector()); + ObjCMethodDecl *IntfMethodDecl = + IDecl->getInstanceMethod((*I)->getSelector()); + assert(IntfMethodDecl && + "IntfMethodDecl is null in ImplMethodsVsClassMethods"); + // ImpMethodDecl may be null as in a @dynamic property. + if (ImpMethodDecl) + WarnConflictingTypedMethods(ImpMethodDecl, IntfMethodDecl); + } llvm::DenseSet<Selector> ClsMap; // Check and see if class methods in class interface have been @@ -917,8 +917,8 @@ void Sema::ImplCategoryMethodsVsIntfMethods(ObjCCategoryImplDecl *CatImplDecl, /// ActOnForwardClassDeclaration - Action::DeclTy * Sema::ActOnForwardClassDeclaration(SourceLocation AtClassLoc, - IdentifierInfo **IdentList, unsigned NumElts) -{ + IdentifierInfo **IdentList, + unsigned NumElts) { llvm::SmallVector<ObjCInterfaceDecl*, 32> Interfaces; for (unsigned i = 0; i != NumElts; ++i) { |