summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclObjC.cpp
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2009-02-16 19:25:52 +0000
committerChris Lattner <sabre@nondot.org>2009-02-16 19:25:52 +0000
commit99a83317b7d760bcc77e15cb71059e2b0fce79da (patch)
treea9dad50aa15182dfa102af626102cb6c1ae30f35 /clang/lib/Sema/SemaDeclObjC.cpp
parentaab70d296313b3c3a13759bfccc325c334f132e3 (diff)
downloadbcm5719-llvm-99a83317b7d760bcc77e15cb71059e2b0fce79da.tar.gz
bcm5719-llvm-99a83317b7d760bcc77e15cb71059e2b0fce79da.zip
code cleanup
llvm-svn: 64651
Diffstat (limited to 'clang/lib/Sema/SemaDeclObjC.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclObjC.cpp34
1 files changed, 17 insertions, 17 deletions
diff --git a/clang/lib/Sema/SemaDeclObjC.cpp b/clang/lib/Sema/SemaDeclObjC.cpp
index 191ac4b2d40..dc8ce062f0b 100644
--- a/clang/lib/Sema/SemaDeclObjC.cpp
+++ b/clang/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) {
OpenPOWER on IntegriCloud