[cfe-commits] r74859 - in /cfe/trunk: include/clang/AST/ASTLocation.h include/clang/AST/DeclReferenceMap.h include/clang/Frontend/Utils.h include/clang/Index/ASTLocation.h include/clang/Index/DeclReferenceMap.h lib/AST/ASTLocation.cpp lib/AST/DeclReferenceMap.cpp lib/Frontend/ResolveLocation.cpp lib/Index/ASTLocation.cpp lib/Index/DeclReferenceMap.cpp tools/index-test/index-test.cpp

Argiris Kirtzidis akyrtzi at gmail.com
Mon Jul 6 14:34:47 PDT 2009


Author: akirtzidis
Date: Mon Jul  6 16:34:47 2009
New Revision: 74859

URL: http://llvm.org/viewvc/llvm-project?rev=74859&view=rev
Log:
Move ASTLocation and DeclReferenceMap from the AST library to the Index library.

Added:
    cfe/trunk/include/clang/Index/ASTLocation.h
      - copied, changed from r74858, cfe/trunk/include/clang/AST/ASTLocation.h
    cfe/trunk/include/clang/Index/DeclReferenceMap.h
      - copied, changed from r74858, cfe/trunk/include/clang/AST/DeclReferenceMap.h
    cfe/trunk/lib/Index/ASTLocation.cpp
      - copied, changed from r74858, cfe/trunk/lib/AST/ASTLocation.cpp
    cfe/trunk/lib/Index/DeclReferenceMap.cpp
      - copied, changed from r74858, cfe/trunk/lib/AST/DeclReferenceMap.cpp
Removed:
    cfe/trunk/include/clang/AST/ASTLocation.h
    cfe/trunk/include/clang/AST/DeclReferenceMap.h
    cfe/trunk/lib/AST/ASTLocation.cpp
    cfe/trunk/lib/AST/DeclReferenceMap.cpp
Modified:
    cfe/trunk/include/clang/Frontend/Utils.h
    cfe/trunk/lib/Frontend/ResolveLocation.cpp
    cfe/trunk/tools/index-test/index-test.cpp

Removed: cfe/trunk/include/clang/AST/ASTLocation.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/ASTLocation.h?rev=74858&view=auto

==============================================================================
--- cfe/trunk/include/clang/AST/ASTLocation.h (original)
+++ cfe/trunk/include/clang/AST/ASTLocation.h (removed)
@@ -1,66 +0,0 @@
-//===--- ASTLocation.h - A <Decl, Stmt> pair --------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  ASTLocation is Decl or a Stmt and its immediate Decl parent.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_AST_ASTLOCATION_H
-#define LLVM_CLANG_AST_ASTLOCATION_H
-
-#include <cassert>
-
-namespace llvm {
-  class raw_ostream;
-}
-
-namespace clang {
-  class Decl;
-  class Stmt;
-
-/// \brief Represents a Decl or a Stmt and its immediate Decl parent. It's
-/// immutable.
-class ASTLocation {
-  Decl *D;
-  Stmt *Stm;
-
-public:
-  ASTLocation() : D(0), Stm(0) {}
-
-  explicit ASTLocation(const Decl *d, const Stmt *stm = 0)
-    : D(const_cast<Decl*>(d)), Stm(const_cast<Stmt*>(stm)) {
-    assert((Stm == 0 || isImmediateParent(D, Stm)) &&
-           "The Decl is not the immediate parent of the Stmt.");
-  }
-
-  const Decl *getDecl() const { return D; }
-  const Stmt *getStmt() const { return Stm; }
-  Decl *getDecl() { return D; }
-  Stmt *getStmt() { return Stm; }
-
-  bool isValid() const { return D != 0; }
-  bool isInvalid() const { return !isValid(); }
-  bool hasStmt() const { return Stm != 0; }
-
-  /// \brief Checks that D is the immediate Decl parent of Node.
-  static bool isImmediateParent(Decl *D, Stmt *Node);
-
-  friend bool operator==(const ASTLocation &L, const ASTLocation &R) { 
-    return L.D == R.D && L.Stm == R.Stm;
-  }
-  friend bool operator!=(const ASTLocation &L, const ASTLocation &R) { 
-    return !(L == R);
-  }
-  
-  void print(llvm::raw_ostream &OS);
-};
-
-} // namespace clang
-
-#endif

Removed: cfe/trunk/include/clang/AST/DeclReferenceMap.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclReferenceMap.h?rev=74858&view=auto

==============================================================================
--- cfe/trunk/include/clang/AST/DeclReferenceMap.h (original)
+++ cfe/trunk/include/clang/AST/DeclReferenceMap.h (removed)
@@ -1,82 +0,0 @@
-//===--- DeclReferenceMap.h - Map Decls to their references -----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  DeclReferenceMap creates a mapping from Decls to the ASTLocations that
-//  reference them.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_CLANG_AST_DECLREFERENCEMAP_H
-#define LLVM_CLANG_AST_DECLREFERENCEMAP_H
-
-#include "clang/AST/ASTLocation.h"
-#include <map>
-
-namespace clang {
-  class ASTContext;
-  class NamedDecl;
-  
-/// \brief Maps NamedDecls with the ASTLocations that reference them.
-///
-/// References are mapped and retrieved using the primary decls
-/// (see Decl::getPrimaryDecl()).
-class DeclReferenceMap {
-public:
-  explicit DeclReferenceMap(ASTContext &Ctx);
-  
-  typedef std::multimap<NamedDecl*, ASTLocation> MapTy;
-
-  class astlocation_iterator {
-    MapTy::iterator I;
-
-    astlocation_iterator(MapTy::iterator i) : I(i) { }
-    friend class DeclReferenceMap;
-
-  public:
-    typedef ASTLocation  value_type;
-    typedef ASTLocation& reference;
-    typedef ASTLocation* pointer;
-    typedef MapTy::iterator::iterator_category iterator_category;
-    typedef MapTy::iterator::difference_type   difference_type;
-
-    astlocation_iterator() { }
-
-    reference operator*() const { return I->second; }
-    pointer operator->() const { return &I->second; }
-
-    astlocation_iterator& operator++() {
-      ++I;
-      return *this;
-    }
-
-    astlocation_iterator operator++(int) {
-      astlocation_iterator tmp(*this);
-      ++(*this);
-      return tmp;
-    }
-
-    friend bool operator==(astlocation_iterator L, astlocation_iterator R) { 
-      return L.I == R.I;
-    }
-    friend bool operator!=(astlocation_iterator L, astlocation_iterator R) { 
-      return L.I != R.I;
-    }
-  };
-
-  astlocation_iterator refs_begin(NamedDecl *D) const;
-  astlocation_iterator refs_end(NamedDecl *D) const;
-  bool refs_empty(NamedDecl *D) const;
-  
-private:
-  mutable MapTy Map;
-};
-  
-} // end clang namespace
-
-#endif

Modified: cfe/trunk/include/clang/Frontend/Utils.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/Utils.h?rev=74859&r1=74858&r2=74859&view=diff

==============================================================================
--- cfe/trunk/include/clang/Frontend/Utils.h (original)
+++ cfe/trunk/include/clang/Frontend/Utils.h Mon Jul  6 16:34:47 2009
@@ -36,7 +36,10 @@
 class Stmt;
 class ASTContext;
 class SourceLocation;
+
+namespace idx {
 class ASTLocation;
+}
 
 /// ProcessWarningOptions - Initialize the diagnostic client and process the
 /// warning options specified on the command line.
@@ -103,7 +106,7 @@
 /// Pointing at '100' will return a <VarDecl 'foo', IntegerLiteral '100'> pair.
 /// Pointing at '++foo' will return a <FunctionDecl 'f', UnaryOperator> pair.
 ///
-ASTLocation ResolveLocationInAST(ASTContext &Ctx, SourceLocation Loc);
+idx::ASTLocation ResolveLocationInAST(ASTContext &Ctx, SourceLocation Loc);
 
 }  // end namespace clang
 

Copied: cfe/trunk/include/clang/Index/ASTLocation.h (from r74858, cfe/trunk/include/clang/AST/ASTLocation.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/ASTLocation.h?p2=cfe/trunk/include/clang/Index/ASTLocation.h&p1=cfe/trunk/include/clang/AST/ASTLocation.h&r1=74858&r2=74859&rev=74859&view=diff

==============================================================================
--- cfe/trunk/include/clang/AST/ASTLocation.h (original)
+++ cfe/trunk/include/clang/Index/ASTLocation.h Mon Jul  6 16:34:47 2009
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_AST_ASTLOCATION_H
-#define LLVM_CLANG_AST_ASTLOCATION_H
+#ifndef LLVM_CLANG_INDEX_ASTLOCATION_H
+#define LLVM_CLANG_INDEX_ASTLOCATION_H
 
 #include <cassert>
 
@@ -24,6 +24,8 @@
   class Decl;
   class Stmt;
 
+namespace idx {
+
 /// \brief Represents a Decl or a Stmt and its immediate Decl parent. It's
 /// immutable.
 class ASTLocation {
@@ -61,6 +63,8 @@
   void print(llvm::raw_ostream &OS);
 };
 
+} // namespace idx
+
 } // namespace clang
 
 #endif

Copied: cfe/trunk/include/clang/Index/DeclReferenceMap.h (from r74858, cfe/trunk/include/clang/AST/DeclReferenceMap.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/DeclReferenceMap.h?p2=cfe/trunk/include/clang/Index/DeclReferenceMap.h&p1=cfe/trunk/include/clang/AST/DeclReferenceMap.h&r1=74858&r2=74859&rev=74859&view=diff

==============================================================================
--- cfe/trunk/include/clang/AST/DeclReferenceMap.h (original)
+++ cfe/trunk/include/clang/Index/DeclReferenceMap.h Mon Jul  6 16:34:47 2009
@@ -12,15 +12,17 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CLANG_AST_DECLREFERENCEMAP_H
-#define LLVM_CLANG_AST_DECLREFERENCEMAP_H
+#ifndef LLVM_CLANG_INDEX_DECLREFERENCEMAP_H
+#define LLVM_CLANG_INDEX_DECLREFERENCEMAP_H
 
-#include "clang/AST/ASTLocation.h"
+#include "clang/Index/ASTLocation.h"
 #include <map>
 
 namespace clang {
   class ASTContext;
   class NamedDecl;
+
+namespace idx {
   
 /// \brief Maps NamedDecls with the ASTLocations that reference them.
 ///
@@ -76,6 +78,8 @@
 private:
   mutable MapTy Map;
 };
+
+} // end idx namespace
   
 } // end clang namespace
 

Removed: cfe/trunk/lib/AST/ASTLocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/ASTLocation.cpp?rev=74858&view=auto

==============================================================================
--- cfe/trunk/lib/AST/ASTLocation.cpp (original)
+++ cfe/trunk/lib/AST/ASTLocation.cpp (removed)
@@ -1,90 +0,0 @@
-//===--- ASTLocation.h - A <Decl, Stmt> pair --------------------*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  ASTLocation is Decl or a Stmt and its immediate Decl parent.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/ASTLocation.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/Expr.h"
-using namespace clang;
-
-static bool isContainedInStatement(Stmt *Node, Stmt *Parent) {
-  assert(Node && Parent && "Passed null Node or Parent");
-  
-  if (Node == Parent)
-    return true;
-  
-  for (Stmt::child_iterator
-         I = Parent->child_begin(), E = Parent->child_end(); I != E; ++I) {
-    if (isContainedInStatement(Node, *I))
-      return true;
-  }
-  
-  return false;
-}
-
-static Decl *FindImmediateParent(Decl *D, Stmt *Node) {
-  assert(D && Node && "Passed null Decl or null Stmt");
-
-  if (VarDecl *VD = dyn_cast<VarDecl>(D)) {
-    Expr *Init = VD->getInit();
-    if (Init == 0)
-      return 0;
-    return isContainedInStatement(Node, Init) ? D : 0;
-  }
-  
-  if (FunctionDecl *FD = dyn_cast<FunctionDecl>(D)) {
-    if (!FD->isThisDeclarationADefinition())
-      return 0;
-    
-    for (DeclContext::decl_iterator
-           I = FD->decls_begin(), E = FD->decls_end(); I != E; ++I) {
-      Decl *Child = FindImmediateParent(*I, Node);
-      if (Child)
-        return Child;
-    }
-    
-    assert(FD->getBody() && "If not definition we should have exited already");
-    return isContainedInStatement(Node, FD->getBody()) ? D : 0;
-  }
-  
-  return 0;
-}
-
-bool ASTLocation::isImmediateParent(Decl *D, Stmt *Node) {
-  assert(D && Node && "Passed null Decl or null Stmt");
-  return D == FindImmediateParent(D, Node);
-}
-
-void ASTLocation::print(llvm::raw_ostream &OS) {
-  assert(isValid() && "ASTLocation is not valid");
-
-  OS << "[Decl: " << getDecl()->getDeclKindName() << " ";
-  if (NamedDecl *ND = dyn_cast<NamedDecl>(getDecl()))
-    OS << ND->getNameAsString();
-  
-  if (getStmt()) {
-    ASTContext &Ctx = getDecl()->getASTContext();
-    OS << " | Stmt: " << getStmt()->getStmtClassName() << " ";
-    getStmt()->printPretty(OS, Ctx, 0, PrintingPolicy(Ctx.getLangOptions()));
-  }
-
-  OS << "] <";
-  
-  SourceRange Range = hasStmt() ? getStmt()->getSourceRange()
-                                : getDecl()->getSourceRange();
-  SourceManager &SourceMgr = getDecl()->getASTContext().getSourceManager();
-  Range.getBegin().print(OS, SourceMgr);
-  OS << ", ";
-  Range.getEnd().print(OS, SourceMgr);
-  OS << ">\n";
-}

Removed: cfe/trunk/lib/AST/DeclReferenceMap.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/AST/DeclReferenceMap.cpp?rev=74858&view=auto

==============================================================================
--- cfe/trunk/lib/AST/DeclReferenceMap.cpp (original)
+++ cfe/trunk/lib/AST/DeclReferenceMap.cpp (removed)
@@ -1,131 +0,0 @@
-//===--- DeclReferenceMap.h - Map Decls to their references -----*- C++ -*-===//
-//
-//                     The LLVM Compiler Infrastructure
-//
-// This file is distributed under the University of Illinois Open Source
-// License. See LICENSE.TXT for details.
-//
-//===----------------------------------------------------------------------===//
-//
-//  DeclReferenceMap creates a mapping from Decls to the ASTLocations that
-//  reference them.
-//
-//===----------------------------------------------------------------------===//
-
-#include "clang/AST/DeclReferenceMap.h"
-#include "clang/AST/Decl.h"
-#include "clang/AST/Stmt.h"
-#include "clang/AST/ASTLocation.h"
-#include "clang/AST/DeclVisitor.h"
-#include "clang/AST/StmtVisitor.h"
-#include "llvm/Support/Compiler.h"
-using namespace clang;
-
-namespace {
-
-class VISIBILITY_HIDDEN StmtMapper : public StmtVisitor<StmtMapper> {
-  DeclReferenceMap::MapTy ⤅
-  Decl *Parent;
-
-public:
-  StmtMapper(DeclReferenceMap::MapTy &map, Decl *parent)
-    : Map(map), Parent(parent) { }
-
-  void VisitDeclStmt(DeclStmt *Node);
-  void VisitDeclRefExpr(DeclRefExpr *Node);
-  void VisitStmt(Stmt *Node);
-};
-
-class VISIBILITY_HIDDEN DeclMapper : public DeclVisitor<DeclMapper> {
-  DeclReferenceMap::MapTy ⤅
-  
-public:
-  DeclMapper(DeclReferenceMap::MapTy &map)
-    : Map(map) { }
-
-  void VisitDeclContext(DeclContext *DC);
-  void VisitVarDecl(VarDecl *D);
-  void VisitFunctionDecl(FunctionDecl *D);
-  void VisitBlockDecl(BlockDecl *D);
-  void VisitDecl(Decl *D);
-};
-
-} // anonymous namespace
-
-//===----------------------------------------------------------------------===//
-// StmtMapper Implementation
-//===----------------------------------------------------------------------===//
-
-void StmtMapper::VisitDeclStmt(DeclStmt *Node) {
-  DeclMapper Mapper(Map);
-  for (DeclStmt::decl_iterator
-         I = Node->decl_begin(), E = Node->decl_end(); I != E; ++I)
-    Mapper.Visit(*I);
-}
-
-void StmtMapper::VisitDeclRefExpr(DeclRefExpr *Node) {
-  NamedDecl *PrimD = cast<NamedDecl>(Node->getDecl()->getPrimaryDecl());
-  Map.insert(std::make_pair(PrimD, ASTLocation(Parent, Node)));
-}
-
-void StmtMapper::VisitStmt(Stmt *Node) {
-  for (Stmt::child_iterator
-         I = Node->child_begin(), E = Node->child_end(); I != E; ++I)
-    Visit(*I);
-}
-
-//===----------------------------------------------------------------------===//
-// DeclMapper Implementation
-//===----------------------------------------------------------------------===//
-
-void DeclMapper::VisitDeclContext(DeclContext *DC) {
-  for (DeclContext::decl_iterator
-         I = DC->decls_begin(), E = DC->decls_end(); I != E; ++I)
-    Visit(*I);
-}
-
-void DeclMapper::VisitFunctionDecl(FunctionDecl *D) {
-  if (!D->isThisDeclarationADefinition())
-    return;
-  
-  StmtMapper(Map, D).Visit(D->getBody());
-}
-
-void DeclMapper::VisitBlockDecl(BlockDecl *D) {
-  StmtMapper(Map, D).Visit(D->getBody());
-}
-
-void DeclMapper::VisitVarDecl(VarDecl *D) {
-  if (Expr *Init = D->getInit())
-    StmtMapper(Map, D).Visit(Init);
-}
-
-void DeclMapper::VisitDecl(Decl *D) {
-  if (DeclContext *DC = dyn_cast<DeclContext>(D))
-    VisitDeclContext(DC);
-}
-
-//===----------------------------------------------------------------------===//
-// DeclReferenceMap Implementation
-//===----------------------------------------------------------------------===//
-
-DeclReferenceMap::DeclReferenceMap(ASTContext &Ctx) {
-  DeclMapper(Map).Visit(Ctx.getTranslationUnitDecl());
-}
-
-DeclReferenceMap::astlocation_iterator
-DeclReferenceMap::refs_begin(NamedDecl *D) const {
-  NamedDecl *Prim = cast<NamedDecl>(D->getPrimaryDecl());
-  return astlocation_iterator(Map.lower_bound(Prim));  
-}
-
-DeclReferenceMap::astlocation_iterator
-DeclReferenceMap::refs_end(NamedDecl *D) const {
-  NamedDecl *Prim = cast<NamedDecl>(D->getPrimaryDecl());
-  return astlocation_iterator(Map.upper_bound(Prim));  
-}
-
-bool DeclReferenceMap::refs_empty(NamedDecl *D) const {
-  NamedDecl *Prim = cast<NamedDecl>(D->getPrimaryDecl());
-  return refs_begin(Prim) == refs_end(Prim);  
-}

Modified: cfe/trunk/lib/Frontend/ResolveLocation.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ResolveLocation.cpp?rev=74859&r1=74858&r2=74859&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/ResolveLocation.cpp (original)
+++ cfe/trunk/lib/Frontend/ResolveLocation.cpp Mon Jul  6 16:34:47 2009
@@ -13,13 +13,14 @@
 //===----------------------------------------------------------------------===//
 
 #include "clang/Frontend/Utils.h"
-#include "clang/AST/ASTLocation.h"
+#include "clang/Index/ASTLocation.h"
 #include "clang/AST/DeclVisitor.h"
 #include "clang/AST/StmtVisitor.h"
 #include "clang/Lex/Lexer.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/Support/Compiler.h"
 using namespace clang;
+using namespace idx;
 
 namespace {
 

Copied: cfe/trunk/lib/Index/ASTLocation.cpp (from r74858, cfe/trunk/lib/AST/ASTLocation.cpp)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/ASTLocation.cpp?p2=cfe/trunk/lib/Index/ASTLocation.cpp&p1=cfe/trunk/lib/AST/ASTLocation.cpp&r1=74858&r2=74859&rev=74859&view=diff

==============================================================================
--- cfe/trunk/lib/AST/ASTLocation.cpp (original)
+++ cfe/trunk/lib/Index/ASTLocation.cpp Mon Jul  6 16:34:47 2009
@@ -1,4 +1,4 @@
-//===--- ASTLocation.h - A <Decl, Stmt> pair --------------------*- C++ -*-===//
+//===--- ASTLocation.cpp - A <Decl, Stmt> pair ------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -11,11 +11,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/AST/ASTLocation.h"
+#include "clang/Index/ASTLocation.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Stmt.h"
 #include "clang/AST/Expr.h"
 using namespace clang;
+using namespace idx;
 
 static bool isContainedInStatement(Stmt *Node, Stmt *Parent) {
   assert(Node && Parent && "Passed null Node or Parent");

Copied: cfe/trunk/lib/Index/DeclReferenceMap.cpp (from r74858, cfe/trunk/lib/AST/DeclReferenceMap.cpp)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/DeclReferenceMap.cpp?p2=cfe/trunk/lib/Index/DeclReferenceMap.cpp&p1=cfe/trunk/lib/AST/DeclReferenceMap.cpp&r1=74858&r2=74859&rev=74859&view=diff

==============================================================================
--- cfe/trunk/lib/AST/DeclReferenceMap.cpp (original)
+++ cfe/trunk/lib/Index/DeclReferenceMap.cpp Mon Jul  6 16:34:47 2009
@@ -1,4 +1,4 @@
-//===--- DeclReferenceMap.h - Map Decls to their references -----*- C++ -*-===//
+//===--- DeclReferenceMap.cpp - Map Decls to their references ---*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -12,14 +12,15 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "clang/AST/DeclReferenceMap.h"
+#include "clang/Index/DeclReferenceMap.h"
+#include "clang/Index/ASTLocation.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Stmt.h"
-#include "clang/AST/ASTLocation.h"
 #include "clang/AST/DeclVisitor.h"
 #include "clang/AST/StmtVisitor.h"
 #include "llvm/Support/Compiler.h"
 using namespace clang;
+using namespace idx;
 
 namespace {
 

Modified: cfe/trunk/tools/index-test/index-test.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/index-test/index-test.cpp?rev=74859&r1=74858&r2=74859&view=diff

==============================================================================
--- cfe/trunk/tools/index-test/index-test.cpp (original)
+++ cfe/trunk/tools/index-test/index-test.cpp Mon Jul  6 16:34:47 2009
@@ -36,13 +36,13 @@
 #include "clang/Index/IndexProvider.h"
 #include "clang/Index/Entity.h"
 #include "clang/Index/TranslationUnit.h"
+#include "clang/Index/ASTLocation.h"
+#include "clang/Index/DeclReferenceMap.h"
 #include "clang/Frontend/ASTUnit.h"
 #include "clang/Frontend/Utils.h"
 #include "clang/Frontend/CommandLineSourceLoc.h"
 #include "clang/AST/Decl.h"
 #include "clang/AST/Expr.h"
-#include "clang/AST/ASTLocation.h"
-#include "clang/AST/DeclReferenceMap.h"
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
 #include "llvm/Support/CommandLine.h"





More information about the cfe-commits mailing list