[cfe-dev] Rename proposal: FindContext => FindDeclVisibleInContext

[Zhongxing Xu]

Hi,

I propose to rename IdentifierResolver::IdDeclInfo::FindContext() to
IdentifierResolver::IdDeclInfo::FindDeclVisibleInContext(), because it
actually returns a Decl, but not a Context

Index:
lib/Sema/IdentifierResolver.cpp

===================================================================

--- lib/Sema/IdentifierResolver.cpp     (revision
60534)
+++ lib/Sema/IdentifierResolver.cpp     (working
copy)
@@ -90,7 +90,8
@@

 /// 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
@@



   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
@@


   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.
Index: lib/Sema/IdentifierResolver.h
===================================================================
--- lib/Sema/IdentifierResolver.h       (revision 60534)
+++ lib/Sema/IdentifierResolver.h       (working copy)
@@ -94,18 +94,18 @@
     /// 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.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-dev/attachments/20081204/385243a4/attachment.html>