maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

simplify some code, bump j. This fixes the remaining test failures. 

llvm-svn: 44941
This commit is contained in:
Chris Lattner 2007-12-12 18:11:49 +00:00
parent 6f6ff37b04
commit 0f29d98419
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
clang/Sema/SemaDeclObjC.cpp
View File

@ -414,11 +414,10 @@ void Sema::CheckImplementationIvars(ObjcImplementationDecl *ImpDecl,
// names and types must match.
//
unsigned j = 0;
bool err = false;
ObjcInterfaceDecl::ivar_iterator
IVI = IDecl->ivar_begin(), IVE = IDecl->ivar_end();
for (; numIvars > 0 && IVI != IVE; ++IVI) {
ObjcIvarDecl* ImplIvar = ivars[j];
ObjcIvarDecl* ImplIvar = ivars[j++];
ObjcIvarDecl* ClsIvar = *IVI;
assert (ImplIvar && "missing implementation ivar");
assert (ClsIvar && "missing class ivar");
@ -435,15 +434,15 @@ void Sema::CheckImplementationIvars(ObjcImplementationDecl *ImpDecl,
ImplIvar->getIdentifier()->getName());
Diag(ClsIvar->getLocation(), diag::err_previous_definition,
ClsIvar->getIdentifier()->getName());
err = true;
break;
return;
}
--numIvars;
}
if (!err && (numIvars > 0 || IVI != IVE))
Diag(numIvars > 0 ? ivars[j]->getLocation() : (*IVI)->getLocation(),
diag::err_inconsistant_ivar);
if (numIvars > 0)
Diag(ivars[j]->getLocation(), diag::err_inconsistant_ivar);
else if (IVI != IVE)
Diag((*IVI)->getLocation(), diag::err_inconsistant_ivar);
}
/// CheckProtocolMethodDefs - This routine checks unimpletented methods