Rename: FindContext -> FindDeclVisibleInContext.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60574 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Zhongxing Xu 2008-12-05 01:57:57 +00:00
Родитель de7394157c
Коммит ebed7971cf
2 изменённых файлов: 8 добавлений и 7 удалений

Просмотреть файл

@ -90,7 +90,8 @@ bool IdentifierResolver::LookupContext::isEqOrContainedBy(
/// in the given context or in a parent of it. The search is in reverse
/// order, from end to begin.
IdentifierResolver::IdDeclInfo::DeclsTy::iterator
IdentifierResolver::IdDeclInfo::FindContext(const LookupContext &Ctx,
IdentifierResolver::IdDeclInfo::FindDeclVisibleInContext(
const LookupContext &Ctx,
const DeclsTy::iterator &Start) {
for (DeclsTy::iterator I = Start; I != Decls.begin(); --I) {
if (Ctx.isEqOrContainedBy(LookupContext(*(I-1))))
@ -267,7 +268,7 @@ IdentifierResolver::begin(DeclarationName Name, const DeclContext *Ctx,
IdDeclInfo::DeclsTy::iterator I;
if (LookInParentCtx)
I = IDI->FindContext(LC);
I = IDI->FindDeclVisibleInContext(LC);
else {
for (I = IDI->decls_end(); I != IDI->decls_begin(); --I)
if (LookupContext(*(I-1)) == LC)
@ -290,7 +291,7 @@ void IdentifierResolver::iterator::PreIncIter() {
BaseIter I = getIterator();
if (LookInParentCtx())
I = Info->FindContext(Ctx, I);
I = Info->FindDeclVisibleInContext(Ctx, I);
else {
if (I != Info->decls_begin() && LookupContext(*(I-1)) != Ctx) {
// The next decl is in different declaration context.

Просмотреть файл

@ -94,18 +94,18 @@ class IdentifierResolver {
/// FindContext - Returns an iterator pointing just after the decl that is
/// in the given context or in a parent of it. The search is in reverse
/// order, from end to begin.
DeclsTy::iterator FindContext(const LookupContext &Ctx) {
return FindContext(Ctx, Decls.end());
DeclsTy::iterator FindDeclVisibleInContext(const LookupContext &Ctx) {
return FindDeclVisibleInContext(Ctx, Decls.end());
}
/// FindContext - Returns an iterator pointing just after the decl that is
/// in the given context or in a parent of it. The search is in reverse
/// order, from end to begin.
DeclsTy::iterator FindContext(const LookupContext &Ctx,
DeclsTy::iterator FindDeclVisibleInContext(const LookupContext &Ctx,
const DeclsTy::iterator &Start);
void AddDecl(NamedDecl *D) {
Decls.insert(FindContext(LookupContext(D)), D);
Decls.insert(FindDeclVisibleInContext(LookupContext(D)), D);
}
/// AddShadowed - Add a decl by putting it directly above the 'Shadow' decl.