-Make IndexProvider an abstract interface for getting indexing information.
-Introduce Indexer as an IndexProvider implementation.
llvm-svn: 77524
diff --git a/clang/lib/Index/Handlers.cpp b/clang/lib/Index/Handlers.cpp
new file mode 100644
index 0000000..c94314b
--- /dev/null
+++ b/clang/lib/Index/Handlers.cpp
@@ -0,0 +1,21 @@
+//===--- Handlers.cpp - Interfaces for receiving information ----*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// Abstract interfaces for receiving information.
+//
+//===----------------------------------------------------------------------===//
+
+#include "clang/Index/Handlers.h"
+#include "clang/Index/Entity.h"
+using namespace clang;
+using namespace idx;
+
+// Out-of-line to give the virtual tables a home.
+EntityHandler::~EntityHandler() { }
+TranslationUnitHandler::~TranslationUnitHandler() { }
diff --git a/clang/lib/Index/IndexProvider.cpp b/clang/lib/Index/IndexProvider.cpp
index 38317eb..eea0988 100644
--- a/clang/lib/Index/IndexProvider.cpp
+++ b/clang/lib/Index/IndexProvider.cpp
@@ -1,74 +1,20 @@
-//===--- IndexProvider.cpp - Map of entities to translation units ---------===//
+//===- IndexProvider.cpp - Maps information to translation units -*- C++ -*-==//
//
// The LLVM Compiler Infrastructure
//
// This file is distributed under the University of Illinois Open Source
-// License. See LICENSaE.TXT for details.
+// License. See LICENSE.TXT for details.
//
//===----------------------------------------------------------------------===//
//
-// Maps Entities to TranslationUnits
+// Maps information to TranslationUnits.
//
//===----------------------------------------------------------------------===//
#include "clang/Index/IndexProvider.h"
-#include "clang/Index/Program.h"
#include "clang/Index/Entity.h"
-#include "clang/Index/EntityHandler.h"
-#include "clang/Index/TranslationUnit.h"
using namespace clang;
using namespace idx;
-class IndexProvider::Indexer : public EntityHandler {
- TranslationUnit *TU;
- MapTy ⤅
-
-public:
- Indexer(TranslationUnit *tu, MapTy &map) : TU(tu), Map(map) { }
-
- virtual void HandleEntity(Entity Ent) {
- if (Ent.isInternalToTU())
- return;
-
- MapTy::iterator I = Map.find(Ent);
- if (I != Map.end()) {
- I->second.insert(TU);
- return;
- }
-
- Map[Ent].insert(TU);
- }
-};
-
-void IndexProvider::IndexAST(TranslationUnit *TU) {
- Indexer Idx(TU, Map);
- Prog.FindEntities(TU->getASTContext(), &Idx);
-}
-
-static IndexProvider::TUSetTy EmptySet;
-
-IndexProvider::translation_unit_iterator
-IndexProvider::translation_units_begin(Entity Ent) const {
- MapTy::iterator I = Map.find(Ent);
- if (I == Map.end())
- return EmptySet.begin();
-
- return I->second.begin();
-}
-
-IndexProvider::translation_unit_iterator
-IndexProvider::translation_units_end(Entity Ent) const {
- MapTy::iterator I = Map.find(Ent);
- if (I == Map.end())
- return EmptySet.end();
-
- return I->second.end();
-}
-
-bool IndexProvider::translation_units_empty(Entity Ent) const {
- MapTy::iterator I = Map.find(Ent);
- if (I == Map.end())
- return true;
-
- return I->second.begin() == I->second.end();
-}
+// Out-of-line to give the virtual table a home.
+IndexProvider::~IndexProvider() { }
diff --git a/clang/lib/Index/Indexer.cpp b/clang/lib/Index/Indexer.cpp
new file mode 100644
index 0000000..58787d1
--- /dev/null
+++ b/clang/lib/Index/Indexer.cpp
@@ -0,0 +1,86 @@
+//===--- Indexer.cpp - IndexProvider implementation -------------*- C++ -*-===//
+//
+// The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// IndexProvider implementation.
+//
+//===----------------------------------------------------------------------===//
+
+#include "clang/Index/Indexer.h"
+#include "clang/Index/Program.h"
+#include "clang/Index/Entity.h"
+#include "clang/Index/Handlers.h"
+#include "clang/Index/TranslationUnit.h"
+using namespace clang;
+using namespace idx;
+
+namespace {
+
+class EntityIndexer : public EntityHandler {
+ TranslationUnit *TU;
+ Indexer::MapTy ⤅
+
+public:
+ EntityIndexer(TranslationUnit *tu, Indexer::MapTy &map) : TU(tu), Map(map) { }
+
+ virtual void HandleEntity(Entity Ent) {
+ if (Ent.isInternalToTU())
+ return;
+ Map[Ent].insert(TU);
+ }
+};
+
+} // anonymous namespace
+
+void Indexer::IndexAST(TranslationUnit *TU) {
+ EntityIndexer Idx(TU, Map);
+ Prog.FindEntities(TU->getASTContext(), &Idx);
+}
+
+void Indexer::GetTranslationUnitsFor(Entity Ent,
+ TranslationUnitHandler *Handler) {
+ assert(Ent.isValid() && "Expected valid Entity");
+ assert(!Ent.isInternalToTU() &&
+ "Expected an Entity visible outside of its translation unit");
+
+ MapTy::iterator I = Map.find(Ent);
+ if (I == Map.end())
+ return;
+
+ TUSetTy &Set = I->second;
+ for (TUSetTy::iterator I = Set.begin(), E = Set.end(); I != E; ++I)
+ Handler->Handle(*I);
+}
+
+static Indexer::TUSetTy EmptySet;
+
+Indexer::translation_unit_iterator
+Indexer::translation_units_begin(Entity Ent) const {
+ MapTy::iterator I = Map.find(Ent);
+ if (I == Map.end())
+ return EmptySet.begin();
+
+ return I->second.begin();
+}
+
+Indexer::translation_unit_iterator
+Indexer::translation_units_end(Entity Ent) const {
+ MapTy::iterator I = Map.find(Ent);
+ if (I == Map.end())
+ return EmptySet.end();
+
+ return I->second.end();
+}
+
+bool Indexer::translation_units_empty(Entity Ent) const {
+ MapTy::iterator I = Map.find(Ent);
+ if (I == Map.end())
+ return true;
+
+ return I->second.begin() == I->second.end();
+}
diff --git a/clang/lib/Index/Program.cpp b/clang/lib/Index/Program.cpp
index 73759dc..48c85f8 100644
--- a/clang/lib/Index/Program.cpp
+++ b/clang/lib/Index/Program.cpp
@@ -13,7 +13,7 @@
#include "clang/Index/Program.h"
#include "ProgramImpl.h"
-#include "clang/Index/EntityHandler.h"
+#include "clang/Index/Handlers.h"
#include "clang/Index/TranslationUnit.h"
#include "clang/AST/DeclBase.h"
#include "clang/AST/ASTContext.h"
@@ -22,11 +22,8 @@
using namespace idx;
// Out-of-line to give the virtual tables a home.
-EntityHandler::~EntityHandler() { }
TranslationUnit::~TranslationUnit() { }
-void EntityHandler::HandleEntity(Entity Ent) { }
-
Program::Program() : Impl(new ProgramImpl()) { }
Program::~Program() {