From e2c8256b26c2d9b3bb59f6d44351955d0b51f7e8 Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Tue, 14 Jul 2015 23:31:30 +0200
Subject: [PATCH] Big cleanup, got rid of several circular includes and class
 forward declarations. Still some work left, but I'll wait with this. Main
 reason behind the cleanup was compilation troubles.

---
 src/CMakeLists.txt                  |   1 -
 src/CodeCompleteResults.cc          |   4 +-
 src/CodeCompleteResults.h           |   8 +-
 src/CompilationDatabase.h           |   3 +-
 src/CompileCommand.h                |   2 +-
 src/CompileCommands.h               |   3 +-
 src/CompletionString.h              |   8 +-
 src/Cursor.cc                       |   4 +-
 src/Cursor.h                        |  10 +--
 src/Diagnostic.cc                   |  20 ++---
 src/Diagnostic.h                    |  14 +---
 src/Index.h                         |   4 -
 src/SourceLocation.cc               |  16 ++--
 src/SourceLocation.h                |  16 ++--
 src/SourceRange.cc                  |  22 ++++-
 src/SourceRange.h                   |  23 +++--
 src/Token.cc                        |  16 ++--
 src/Token.h                         |  19 +++--
 src/Tokens.cc                       | 125 ++++++++++++++++++++++++++--
 src/Tokens.h                        |  16 +++-
 src/TranslationUnit.cc              |   2 +-
 src/TranslationUnit.h               |  16 +---
 tests/CodeCompleteResults_H_Test.cc |   2 +-
 tests/CompletionString_H_Test.cc    |   2 +-
 tests/Cursor_H_Test.cc              |   4 +-
 tests/Diagnostics_Test.cc           |   6 +-
 tests/SourceLocation_H_Test.cc      |   8 +-
 tests/Token_H_Test.cc               |   8 +-
 28 files changed, 243 insertions(+), 139 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1a1ae1c..b30f052 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -12,7 +12,6 @@ message("Searcing for libclang")
 find_package(LibClang REQUIRED)
 
 set(header_files
-  clangmm.h             
   CodeCompleteResults.h 
   CompilationDatabase.h 
   CompileCommand.h      
diff --git a/src/CodeCompleteResults.cc b/src/CodeCompleteResults.cc
index 6a281e8..ea1b0f6 100644
--- a/src/CodeCompleteResults.cc
+++ b/src/CodeCompleteResults.cc
@@ -3,7 +3,7 @@
 #include <exception>
 
 clang::CodeCompleteResults::
-CodeCompleteResults(clang::TranslationUnit *tu,
+CodeCompleteResults(CXTranslationUnit &tu,
                     const std::string &file_name,
                     const std::map<std::string, std::string>  &buffers,
                     int line_num,
@@ -16,7 +16,7 @@ CodeCompleteResults(clang::TranslationUnit *tu,
     file.Length = buffer.second.size();
     files.push_back(file);
   }
-  results_ = clang_codeCompleteAt(tu->tu_,
+  results_ = clang_codeCompleteAt(tu,
                                   file_name.c_str(),
                                   line_num,
                                   column,
diff --git a/src/CodeCompleteResults.h b/src/CodeCompleteResults.h
index 8446a74..2269f68 100644
--- a/src/CodeCompleteResults.h
+++ b/src/CodeCompleteResults.h
@@ -1,14 +1,13 @@
 #ifndef CODECOMPLETERESULTS_H_
 #define CODECOMPLETERESULTS_H_
 #include <clang-c/Index.h>
-#include "TranslationUnit.h"
+#include <map>
+#include "CompletionString.h"
 
 namespace clang {
-  class CompletionString;
-
   class CodeCompleteResults {
   public:
-    CodeCompleteResults(TranslationUnit *tu,
+    CodeCompleteResults(CXTranslationUnit &tu,
                         const std::string &file_name,
                         const std::map<std::string, std::string>  &buffers,
                         int line_num,
@@ -17,7 +16,6 @@ namespace clang {
     CompletionString get(int index);
     int size();
 
-  private:
     CXCodeCompleteResults *results_;
   };
 }  // namespace clang
diff --git a/src/CompilationDatabase.h b/src/CompilationDatabase.h
index 8d66a57..7d35e56 100644
--- a/src/CompilationDatabase.h
+++ b/src/CompilationDatabase.h
@@ -11,9 +11,8 @@ namespace clang {
     explicit CompilationDatabase(const std::string &project_path);
     CompilationDatabase();
     ~CompilationDatabase();
-  private:
+
     CXCompilationDatabase db_;
-    friend CompileCommands;
   };
 }
 
diff --git a/src/CompileCommand.h b/src/CompileCommand.h
index f56dac8..cf3892e 100644
--- a/src/CompileCommand.h
+++ b/src/CompileCommand.h
@@ -9,7 +9,7 @@ namespace clang {
     CompileCommand(int nth, CompileCommands *commands);
     std::string get_command();
     std::vector<std::string> get_command_as_args();
-  private:
+
     CXCompileCommand command_;
   };
 }
diff --git a/src/CompileCommands.h b/src/CompileCommands.h
index f56d859..7c4cb8d 100644
--- a/src/CompileCommands.h
+++ b/src/CompileCommands.h
@@ -12,9 +12,8 @@ namespace clang {
     CompileCommands(const std::string &filename, CompilationDatabase *db);
     std::vector<CompileCommand> get_commands();
     ~CompileCommands();
-  private:
+
     CXCompileCommands commands_;
-    friend class CompileCommand;
   };
 }
 #endif  // COMPILECOMMANDS_H_
diff --git a/src/CompletionString.h b/src/CompletionString.h
index eee7013..23f9ea2 100644
--- a/src/CompletionString.h
+++ b/src/CompletionString.h
@@ -1,7 +1,8 @@
 #ifndef COMPLETIONSTRING_H_
 #define COMPLETIONSTRING_H_
 #include <clang-c/Index.h>
-#include "CodeCompleteResults.h"
+#include <string>
+#include <vector>
 
 namespace clang {
   enum CompletionChunkKind {
@@ -27,14 +28,13 @@ namespace clang {
 
   class CompletionString {
   public:
+    explicit CompletionString(const CXCompletionString &str);
     bool available();
     std::vector<CompletionChunk> get_chunks();
     std::string get_brief_comments();
     int get_num_chunks();
-  private:
-    explicit CompletionString(const CXCompletionString &str);
+    
     CXCompletionString str_;
-    friend CodeCompleteResults;
   };
 }  // namespace clang
 #endif  // COMPLETIONSTRING_H_
diff --git a/src/Cursor.cc b/src/Cursor.cc
index e6ab0b7..7f9b3c8 100644
--- a/src/Cursor.cc
+++ b/src/Cursor.cc
@@ -5,6 +5,6 @@ const clang::CursorKind clang::Cursor::kind() {
 }
 
 clang::Cursor::
-Cursor(clang::TranslationUnit *tu, clang::SourceLocation *source_location) {
-  cursor_ = clang_getCursor(tu->tu_, source_location->location_);
+Cursor(CXTranslationUnit &tu, clang::SourceLocation *source_location) {
+  cursor_ = clang_getCursor(tu, source_location->location_);
 }
diff --git a/src/Cursor.h b/src/Cursor.h
index 5740226..d7326ff 100644
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -1,9 +1,11 @@
 #ifndef CURSOR_H_
 #define CURSOR_H_
-#include "TranslationUnit.h"
+#include <clang-c/Index.h>
 #include "SourceLocation.h"
 
 namespace clang {
+  class SourceLocation;
+  
   enum class CursorKind {
     UnexposedDecl = 1,
     StructDecl = 2,
@@ -175,13 +177,9 @@ namespace clang {
   class Cursor {
   public:
     Cursor() {}
-    Cursor(TranslationUnit *tu, SourceLocation *source_location);
+    Cursor(CXTranslationUnit &tu, SourceLocation *source_location);
     const CursorKind kind();
-  private:
     CXCursor cursor_;
-    friend SourceRange;
-    friend SourceLocation;
-    friend Tokens;
   };
 }  // namespace clang
 #endif  // CURSOR_H_
diff --git a/src/Diagnostic.cc b/src/Diagnostic.cc
index 5712527..fa446e7 100644
--- a/src/Diagnostic.cc
+++ b/src/Diagnostic.cc
@@ -2,29 +2,19 @@
 #include "SourceLocation.h"
 #include "Tokens.h"
 
-clang::Diagnostic::Diagnostic(clang::TranslationUnit& tu, CXDiagnostic& clang_diagnostic) {
+clang::Diagnostic::Diagnostic(CXTranslationUnit& tu, CXDiagnostic& clang_diagnostic) {
   severity=clang_getDiagnosticSeverity(clang_diagnostic);
   severity_spelling=get_severity_spelling(severity);
   spelling=clang_getCString(clang_getDiagnosticSpelling(clang_diagnostic));
   clang::SourceLocation location(clang_getDiagnosticLocation(clang_diagnostic));
-  std::string tmp_path;
-  unsigned line, column, offset;
-  location.get_location_info(&tmp_path, &line, &column, &offset);
-  path=tmp_path;
-  start_location.line=line;
-  start_location.column=column;
-  start_location.offset=offset;
   
   clang::SourceRange range(&location, &location);
-  clang::Tokens tokens(&tu, &range);
+  clang::Tokens tokens(tu, &range);
   if(tokens.size()==1) {
     auto& token=tokens[0];
-    clang::SourceRange range=token.get_source_range(&tu);
-    clang::SourceLocation location(&range, false);
-    location.get_location_info(NULL, &line, &column, &offset);
-    end_location.line=line;
-    end_location.column=column;
-    end_location.offset=offset;
+    clang::SourceRange range=token.get_source_range();
+    auto end_location=clang::SourceLocation(&range, false);
+    this->range=range.get_range_data(location, end_location);
   }
 }
 
diff --git a/src/Diagnostic.h b/src/Diagnostic.h
index c858d33..773b986 100644
--- a/src/Diagnostic.h
+++ b/src/Diagnostic.h
@@ -3,25 +3,19 @@
 #include <string>
 #include <vector>
 #include <clang-c/Index.h>
-#include "TranslationUnit.h"
+#include "SourceRange.h"
 
-namespace clang {  
+namespace clang {
   class Diagnostic {
   public:
-    class LocationData {
-    public:
-      unsigned line, column, offset;
-    };
-    
-    Diagnostic(clang::TranslationUnit& tu, CXDiagnostic& clang_diagnostic);
+    Diagnostic(CXTranslationUnit& tu, CXDiagnostic& clang_diagnostic);
     
     static const std::string get_severity_spelling(unsigned severity);
 
     unsigned severity;
     std::string severity_spelling;
     std::string spelling;
-    std::string path;
-    LocationData start_location, end_location;
+    RangeData range;
   };
 }
 
diff --git a/src/Index.h b/src/Index.h
index f93feab..6e71e7b 100644
--- a/src/Index.h
+++ b/src/Index.h
@@ -1,16 +1,12 @@
 #ifndef INDEX_H_
 #define INDEX_H_
-
 #include <clang-c/Index.h>
 
 namespace clang {
-  class TranslationUnit;
   class Index {
   public:
     Index(int excludeDeclarationsFromPCH, int displayDiagnostics);
-  private:
     CXIndex index_;
-    friend TranslationUnit;
   };
 }  // namespace clang
 #endif  // INDEX_H_
diff --git a/src/SourceLocation.cc b/src/SourceLocation.cc
index c68d32f..13506ae 100644
--- a/src/SourceLocation.cc
+++ b/src/SourceLocation.cc
@@ -4,13 +4,13 @@
 //  SourceLocation   //
 // // // // // // // //
 clang::SourceLocation::
-SourceLocation(clang::TranslationUnit *tu,
+SourceLocation(CXTranslationUnit &tu,
                const std::string &filename,
                int line_number,
                int line_offset) {
-  CXFile file = clang_getFile(tu->tu_,
+  CXFile file = clang_getFile(tu,
                               filename.c_str());
-  location_ = clang_getLocation(tu->tu_,
+  location_ = clang_getLocation(tu,
                                 file,
                                 line_number,
                                 line_offset);
@@ -28,19 +28,19 @@ SourceLocation(clang::SourceRange *range, bool start) {
 }
 
 clang::SourceLocation::
-SourceLocation(TranslationUnit *tu,
+SourceLocation(CXTranslationUnit &tu,
                Token *token) {
-  location_ = clang_getTokenLocation(tu->tu_,
+  location_ = clang_getTokenLocation(tu,
                                      token->token_);
 }
 
 clang::SourceLocation::
-SourceLocation(clang::TranslationUnit *tu,
+SourceLocation(CXTranslationUnit &tu,
                const std::string &filepath,
                int offset) {
-  CXFile file = clang_getFile(tu->tu_,
+  CXFile file = clang_getFile(tu,
                               filepath.c_str());
-  location_ = clang_getLocationForOffset(tu->tu_,
+  location_ = clang_getLocationForOffset(tu,
                                          file,
                                          offset);
 }
diff --git a/src/SourceLocation.h b/src/SourceLocation.h
index 286ddbb..81394ec 100644
--- a/src/SourceLocation.h
+++ b/src/SourceLocation.h
@@ -1,23 +1,28 @@
 #ifndef SOURCELOCATION_H_
 #define SOURCELOCATION_H_
-#include "TranslationUnit.h"
+#include <clang-c/Index.h>
 #include "Token.h"
 #include "Cursor.h"
+#include <string>
 
 namespace clang {
+  class Token;
+  class SourceRange;
+  class Cursor;
+  
   class SourceLocation {
   public:
-    SourceLocation(TranslationUnit* tu,
+    SourceLocation(CXTranslationUnit &tu,
                    const std::string &filename,
                    int line_number,
                    int column);
 
-    SourceLocation(TranslationUnit *tu,
+    SourceLocation(CXTranslationUnit &tu,
                    Token *token);
 
     SourceLocation(SourceRange *range, bool start);
 
-    SourceLocation(TranslationUnit *tu,
+    SourceLocation(CXTranslationUnit &tu,
                    const std::string &filepath,
                    int offset);
 
@@ -30,10 +35,7 @@ namespace clang {
                            unsigned *column,
                            unsigned *offset);
 
-  private:
     CXSourceLocation location_;
-    friend SourceRange;
-    friend Cursor;
   };
 
 }  // namespace clang
diff --git a/src/SourceRange.cc b/src/SourceRange.cc
index 87581d4..8de63a6 100644
--- a/src/SourceRange.cc
+++ b/src/SourceRange.cc
@@ -1,8 +1,8 @@
 #include "SourceRange.h"
 
 clang::SourceRange::
-SourceRange(clang::TranslationUnit *tu, clang::Token *token) {
-  range_ = clang_getTokenExtent(tu->tu_, token->token_);
+SourceRange(clang::Token *token) {
+  range_ = clang_getTokenExtent(token->tu, token->token_);
 }
 
 clang::SourceRange::
@@ -13,3 +13,21 @@ SourceRange(clang::SourceLocation *start, clang::SourceLocation *end) {
 clang::SourceRange::SourceRange(Cursor *cursor) {
   range_ = clang_getCursorExtent(cursor->cursor_);
 }
+
+clang::RangeData clang::SourceRange::get_range_data(clang::SourceLocation &start, clang::SourceLocation &end) {
+  std::string path;
+  unsigned start_offset, end_offset;
+  start.get_location_info(&path, NULL, NULL, &start_offset);
+  end.get_location_info(NULL, NULL, NULL, &end_offset);
+  RangeData range_data;
+  range_data.path=path;
+  range_data.start_offset=start_offset;
+  range_data.end_offset=end_offset;
+  return range_data;
+}
+
+clang::RangeData clang::SourceRange::get_range_data() {
+  clang::SourceLocation start(this, true);
+  clang::SourceLocation end(this, false);
+  return get_range_data(start, end);
+}
\ No newline at end of file
diff --git a/src/SourceRange.h b/src/SourceRange.h
index d1f772b..be74888 100644
--- a/src/SourceRange.h
+++ b/src/SourceRange.h
@@ -1,23 +1,32 @@
 #ifndef SOURCERANGE_H_
 #define SOURCERANGE_H_
-#include "TranslationUnit.h"
+#include <clang-c/Index.h>
 #include "Token.h"
 #include "Cursor.h"
+#include "SourceLocation.h"
+#include <string>
 
 namespace clang {
+  class Token;
+  class SourceLocation;
+  class Cursor;
+  
+  class RangeData {
+  public:
+    std::string path;
+    unsigned start_offset, end_offset;
+  };
+  
   class SourceRange {
   public:
     SourceRange() {}
-    SourceRange(TranslationUnit *tu, Token *token);
+    SourceRange(Token *token);
     SourceRange(SourceLocation *start,
                 SourceLocation *end);
     explicit SourceRange(Cursor *cursor);
-
-  private:
+    static RangeData get_range_data(SourceLocation &start, SourceLocation &end);
+    RangeData get_range_data();
     CXSourceRange range_;
-    friend Tokens;
-    friend SourceLocation;
-    friend Diagnostic;
   };
 }  // namespace clang
 #endif  // SOURCERANGE_H_
diff --git a/src/Token.cc b/src/Token.cc
index 455da1a..6ac0945 100644
--- a/src/Token.cc
+++ b/src/Token.cc
@@ -5,25 +5,23 @@
 // // // // //
 
 // clang::Token instansiates an token
-clang::Token::Token(const CXToken &token) :
-  token_(token) {
+clang::Token::Token(CXTranslationUnit &tu, const CXToken &token) :
+  tu(tu), token_(token) {
 }
 
 // returns gets an source location for this token objekt
 // based on the translationunit given
-clang::SourceLocation clang::Token::
-       get_source_location(clang::TranslationUnit *tu) {
+clang::SourceLocation clang::Token::get_source_location() {
   return SourceLocation(tu, this);
 }
 
 // returns a sourcerange that covers this token
-clang::SourceRange clang::Token::
-       get_source_range(clang::TranslationUnit *tu) {
-  return SourceRange(tu, this);
+clang::SourceRange clang::Token::get_source_range() {
+  return SourceRange(this);
 }
 // returns a string description of this tokens kind
-std::string clang::Token::get_token_spelling(clang::TranslationUnit *tu) {
-  CXString s = clang_getTokenSpelling(tu->tu_, token_);
+std::string clang::Token::get_token_spelling() {
+  CXString s = clang_getTokenSpelling(tu, token_);
   return std::string(clang_getCString(s));
 }
 
diff --git a/src/Token.h b/src/Token.h
index dd8efe4..627b6ef 100644
--- a/src/Token.h
+++ b/src/Token.h
@@ -1,10 +1,14 @@
 #ifndef TOKEN_H_
 #define TOKEN_H_
+#include <clang-c/Index.h>
 #include "SourceLocation.h"
 #include "SourceRange.h"
-#include "TranslationUnit.h"
+#include <string>
 
 namespace clang {
+  class SourceLocation;
+  class SourceRange;
+  
   enum TokenKind {
     Token_Punctuation,
     Token_Keyword,
@@ -15,17 +19,14 @@ namespace clang {
 
   class Token {
   public:
+    explicit Token(CXTranslationUnit &tu, const CXToken &token);
     const TokenKind kind();
-    std::string get_token_spelling(TranslationUnit *tu);
-    SourceLocation get_source_location(TranslationUnit *tu);
-    SourceRange get_source_range(TranslationUnit *tu);
+    std::string get_token_spelling();
+    SourceLocation get_source_location();
+    SourceRange get_source_range();
     std::string type;
-  private:
-    explicit Token(const CXToken &token);
-    friend SourceRange;
-    friend SourceLocation;
-    friend Tokens;
     const CXToken& token_;
+    CXTranslationUnit &tu;
   };
 }  // namespace clang
 #endif  // TOKEN_H_
diff --git a/src/Tokens.cc b/src/Tokens.cc
index 571d0db..9b2b1e8 100644
--- a/src/Tokens.cc
+++ b/src/Tokens.cc
@@ -2,24 +2,24 @@
 #include <iostream>
 using namespace std;
 
-clang::Tokens::Tokens(clang::TranslationUnit *tu, clang::SourceRange *range): tu(*tu) {
-  clang_tokenize(tu->tu_,
+clang::Tokens::Tokens(CXTranslationUnit &tu, clang::SourceRange *range): tu(tu) {
+  clang_tokenize(tu,
                  range->range_,
                  &tokens_,
                  &num_tokens_);
   for (int i = 0; i < num_tokens_; i++) {
-    push_back(clang::Token(tokens_[i]));
+    emplace_back(tu, tokens_[i]);
   }
 }
 
 clang::Tokens::~Tokens() {
-  clang_disposeTokens(tu.tu_, tokens_, size());
+  clang_disposeTokens(tu, tokens_, size());
 }
 
-void clang::Tokens::update_types(clang::TranslationUnit *tu) {
+void clang::Tokens::update_types() {
   clang_cursors.clear();
   clang_cursors.reserve(size());
-  clang_annotateTokens(tu->tu_, tokens_, size(), clang_cursors.data());
+  clang_annotateTokens(tu, tokens_, size(), clang_cursors.data());
   
   for(size_t c=0;c<size();c++) {
     auto referenced=clang_getCursorReferenced(clang_cursors[c]);
@@ -81,6 +81,119 @@ void clang::Tokens::update_types(clang::TranslationUnit *tu) {
   }
 }
 
+CXCursor clang::Tokens::find_referenced() {
+  clang_cursors.clear();
+  clang_cursors.reserve(size());
+  clang_annotateTokens(tu, tokens_, size(), clang_cursors.data());
+
+  auto kind=clang_getCursorKind(clang_cursors[0]);
+  cout << "  " << kind << endl;
+  cout << "  Decl: " << clang_isDeclaration(kind) << endl;
+  cout << "  Attr: " << clang_isAttribute(kind) << endl;
+  cout << "  Ref: " << clang_isReference(kind) << endl;
+  cout << "  Expr: " << clang_isExpression(kind) << endl;
+
+  auto referenced=clang_getCursorReferenced(clang_cursors[0]);
+  
+  kind=clang_getCursorKind(referenced);
+  cout << "  " << kind << endl;
+  cout << "  Decl: " << clang_isDeclaration(kind) << endl;
+  cout << "  Attr: " << clang_isAttribute(kind) << endl;
+  cout << "  Ref: " << clang_isReference(kind) << endl;
+  cout << "  Expr: " << clang_isExpression(kind) << endl;
+
+  //TODO: To find similar function declarations, these must be equal (if cursor is declaration):
+  //TODO: How do we know it is a function? clang_getCursorKind(cursor)==CXCursor_CXXMethod?
+  cout << "    " << clang_getCString(clang_getTypeSpelling(clang_getCursorType(referenced))) << endl;
+  cout << "    " << clang_getCString(clang_getTypeSpelling(clang_getCursorType(clang_getCursorSemanticParent(referenced)))) << endl;
+  cout << "    " << clang_getCString(clang_getCursorSpelling(referenced)) << endl;
+  
+  return referenced;
+}
+
+bool clang::Tokens::equalCursors(CXCursor a, CXCursor b) {
+  clang::Cursor cursor_a;
+  cursor_a.cursor_=a;
+  auto range=clang::SourceRange(&cursor_a);
+  auto location=clang::SourceLocation(&range, true);
+  std::string path_a;
+  unsigned offset_start_a, offset_end_a;
+  location.get_location_info(&path_a, NULL, NULL, &offset_start_a);
+  location=clang::SourceLocation(&range, false);
+  location.get_location_info(NULL, NULL, NULL, &offset_end_a);
+  
+  clang::Cursor cursor_b;
+  cursor_b.cursor_=b;
+  range=clang::SourceRange(&cursor_b);
+  location=clang::SourceLocation(&range, true);
+  std::string path_b;
+  unsigned offset_start_b, offset_end_b;
+  location.get_location_info(&path_b, NULL, NULL, &offset_start_b);
+  location=clang::SourceLocation(&range, false);
+  location.get_location_info(NULL, NULL, NULL, &offset_end_b);
+  
+  return path_a==path_b && offset_start_a==offset_start_b && offset_end_a==offset_end_b;
+}
+
+void clang::Tokens::rename(CXCursor& referenced, std::unordered_map<std::string, std::unordered_multimap<unsigned, unsigned> > &ranges) {
+  for(size_t c=0;c<size();c++) {
+    auto a_referenced=clang_getCursorReferenced(clang_cursors[c]);
+    if(equalCursors(a_referenced, referenced)) {
+      std::string path;
+      unsigned line, column, offset;
+      
+      clang::Cursor cursor;
+      cursor.cursor_=clang_cursors[c];
+      auto range=clang::SourceRange(&cursor);
+      auto location=clang::SourceLocation(&range, true);
+      location.get_location_info(&path, &line, &column, &offset);
+      cout << "  start: " << path << ", " << line << ", " << column << endl;
+      location=clang::SourceLocation(&range, false);
+      location.get_location_info(&path, &line, &column, &offset);
+      cout << "  end: " << path << ", " << line << ", " << column << endl;
+
+      
+      clang::Cursor referenced_cursor;
+      referenced_cursor.cursor_=a_referenced;
+      range=clang::SourceRange(&referenced_cursor);
+      location=clang::SourceLocation(&range, true);
+      location.get_location_info(&path, &line, &column, &offset);
+      cout << "    start: " << path << ", " << line << ", " << column << endl;
+
+      location=clang::SourceLocation(&range, false);
+      location.get_location_info(&path, &line, &column, &offset);
+      cout << "    end: " << path << ", " << line << ", " << column << endl;
+
+      auto type=clang_getCursorType(a_referenced);
+      cout << "    " << clang_getCString(clang_getTypeSpelling(type)) << endl;
+    }
+  }
+  //clang_visitChildren(clang_getTranslationUnitCursor(tu.tu_), clang::Tokens::clang_visitor, &referenced);
+}
+
+/*CXChildVisitResult clang::Tokens::clang_visitor(CXCursor cursor, CXCursor parent, CXClientData clientData) {
+  CXCursor* referenced=(CXCursor*)clientData;
+  auto a_referenced=clang_getCursorReferenced(cursor);
+  if(clang_equalCursors(a_referenced, *referenced)) {
+    cout << "found" << endl;
+    clang::Cursor a_cursor;
+    a_cursor.cursor_=cursor;
+    auto range=clang::SourceRange(&a_cursor);
+
+    auto location=clang::SourceLocation(&range, true);
+    std::string path;
+    unsigned line, column, offset;
+    location.get_location_info(&path, &line, &column, &offset);
+    cout << "  start: " << path << ", " << line << ", " << column << endl;
+
+    location=clang::SourceLocation(&range, false);
+    location.get_location_info(&path, &line, &column, &offset);
+    cout << "  end: " << path << ", " << line << ", " << column << endl;
+  }
+  
+  return CXChildVisit_Recurse;
+}*/
+
 std::string clang::Tokens::get_brief_comments(size_t cursor_id) {
   std::string comment_string;
   auto referenced=clang_getCursorReferenced(clang_cursors[cursor_id]);
diff --git a/src/Tokens.h b/src/Tokens.h
index 8696337..c8e7d3a 100644
--- a/src/Tokens.h
+++ b/src/Tokens.h
@@ -1,21 +1,29 @@
 #ifndef TOKENS_H_
 #define TOKENS_H_
-#include "TranslationUnit.h"
+#include <clang-c/Index.h>
 #include "SourceRange.h"
 #include "Token.h"
+#include <unordered_map>
+#include <vector>
 
 namespace clang {
   class Tokens : public std::vector<clang::Token> {
   public:
-    Tokens(TranslationUnit *tu, SourceRange *range);
+    Tokens(CXTranslationUnit &tu, SourceRange *range);
     ~Tokens();
-    void update_types(clang::TranslationUnit *tu);
+    void update_types();
     std::string get_brief_comments(size_t cursor_id);
+    CXCursor find_referenced();
+    bool equalCursors(CXCursor a, CXCursor b);
+    void rename(CXCursor &referenced, std::unordered_map<std::string, std::unordered_multimap<unsigned, unsigned> > &ranges);
+    
   private:
     CXToken *tokens_;
     unsigned num_tokens_;
     std::vector<CXCursor> clang_cursors;
-    TranslationUnit& tu;
+    CXTranslationUnit& tu;
+    
+    static CXChildVisitResult clang_visitor(CXCursor cursor, CXCursor parent, CXClientData clientData);
   };
 }  // namespace clang
 #endif  // TOKENS_H_
diff --git a/src/TranslationUnit.cc b/src/TranslationUnit.cc
index de1c2aa..497c62d 100644
--- a/src/TranslationUnit.cc
+++ b/src/TranslationUnit.cc
@@ -101,7 +101,7 @@ void clang::TranslationUnit::update_diagnostics() {
   diagnostics.clear();
   for(unsigned c=0;c<clang_getNumDiagnostics(tu_);c++) {
     CXDiagnostic clang_diagnostic=clang_getDiagnostic(tu_, c);
-    diagnostics.emplace_back(clang::Diagnostic(*this, clang_diagnostic));
+    diagnostics.emplace_back(clang::Diagnostic(tu_, clang_diagnostic));
     clang_disposeDiagnostic(clang_diagnostic);
   }
 }
diff --git a/src/TranslationUnit.h b/src/TranslationUnit.h
index b04a93e..c8eace5 100644
--- a/src/TranslationUnit.h
+++ b/src/TranslationUnit.h
@@ -9,14 +9,6 @@
 #include "Diagnostic.h"
 
 namespace clang {
-  class Token;
-  class Tokens;
-  class SourceLocation;
-  class SourceRange;
-  class Cursor;
-  class CodeCompleteResults;
-  class Diagnostic;
-
   class TranslationUnit {
   public:
     TranslationUnit(Index *index,
@@ -39,18 +31,12 @@ namespace clang {
     void update_diagnostics();
     
     std::vector<clang::Diagnostic> diagnostics;
-  private:
+
     void parse(Index *index,
                const std::string &filepath,
                const std::vector<std::string> &command_line_args,
                const std::map<std::string, std::string> &buffers,
                unsigned flags=DefaultFlags());
-    friend Token;
-    friend Tokens;
-    friend SourceLocation;
-    friend SourceRange;
-    friend Cursor;
-    friend CodeCompleteResults;
     CXTranslationUnit tu_;
   };
 }  // namespace clang
diff --git a/tests/CodeCompleteResults_H_Test.cc b/tests/CodeCompleteResults_H_Test.cc
index c696727..a5b4ad1 100644
--- a/tests/CodeCompleteResults_H_Test.cc
+++ b/tests/CodeCompleteResults_H_Test.cc
@@ -28,7 +28,7 @@ BOOST_AUTO_TEST_CASE(code_complete_results) {
 
   // ]
 
-  clang::CodeCompleteResults results(&tu, path, buffers, 4, 5);
+  clang::CodeCompleteResults results(tu.tu_, path, buffers, 4, 5);
 
   bool substr_found=false;
   for(int c=0;c<results.size();c++) {
diff --git a/tests/CompletionString_H_Test.cc b/tests/CompletionString_H_Test.cc
index ba404ca..6712f3f 100644
--- a/tests/CompletionString_H_Test.cc
+++ b/tests/CompletionString_H_Test.cc
@@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE(completion_string) {
 
   buffers[path] = file;
 
-  clang::CodeCompleteResults results(&tu, path, buffers, 4, 5);
+  clang::CodeCompleteResults results(tu.tu_, path, buffers, 4, 5);
 
   // ]
 
diff --git a/tests/Cursor_H_Test.cc b/tests/Cursor_H_Test.cc
index afe10ef..5317a18 100644
--- a/tests/Cursor_H_Test.cc
+++ b/tests/Cursor_H_Test.cc
@@ -12,8 +12,8 @@ BOOST_AUTO_TEST_CASE(cursor) {
 
   // ]
 
-  clang::SourceLocation location(&tu, path, 6, 4);
-  clang::Cursor cursor(&tu, &location);
+  clang::SourceLocation location(tu.tu_, path, 6, 4);
+  clang::Cursor cursor(tu.tu_, &location);
 
   BOOST_CHECK(cursor.kind() == clang::CursorKind::ReturnStmt);
 }
diff --git a/tests/Diagnostics_Test.cc b/tests/Diagnostics_Test.cc
index 6351552..98f0d63 100644
--- a/tests/Diagnostics_Test.cc
+++ b/tests/Diagnostics_Test.cc
@@ -23,10 +23,6 @@ BOOST_AUTO_TEST_CASE(diagnostics_test) {
   tu.update_diagnostics();
   BOOST_CHECK(tu.diagnostics.size()==1);
   BOOST_CHECK(tu.diagnostics[0].spelling=="use of undeclared identifier 'undeclared_variable'");
-  BOOST_CHECK(tu.diagnostics[0].path=="./case/main_error.cpp");
+  BOOST_CHECK(tu.diagnostics[0].range.path=="./case/main_error.cpp");
   BOOST_CHECK(tu.diagnostics[0].severity==3);
-  BOOST_CHECK(tu.diagnostics[0].start_location.line==5);
-  BOOST_CHECK(tu.diagnostics[0].end_location.line==5);
-  BOOST_CHECK(tu.diagnostics[0].start_location.column==16);
-  BOOST_CHECK(tu.diagnostics[0].end_location.column==35);  
 }
diff --git a/tests/SourceLocation_H_Test.cc b/tests/SourceLocation_H_Test.cc
index 308fe6a..56e2ac3 100644
--- a/tests/SourceLocation_H_Test.cc
+++ b/tests/SourceLocation_H_Test.cc
@@ -8,12 +8,12 @@ BOOST_AUTO_TEST_CASE(source_location) {
   clang::Index index(0, 0);
 
   clang::TranslationUnit tu(&index, path);
-  clang::SourceLocation start(&tu, path, 0);
-  clang::SourceLocation end(&tu, path, 7, 1);
+  clang::SourceLocation start(tu.tu_, path, 0);
+  clang::SourceLocation end(tu.tu_, path, 7, 1);
   clang::SourceRange range(&start, &end);
-  clang::Tokens tokens(&tu, &range);
+  clang::Tokens tokens(tu.tu_, &range);
 
-  clang::SourceRange token_range  = tokens[28].get_source_range(&tu);
+  clang::SourceRange token_range  = tokens[28].get_source_range();
 
   unsigned token_start_line, token_start_column, token_start_offset,
     token_end_line, token_end_column, token_end_offset;
diff --git a/tests/Token_H_Test.cc b/tests/Token_H_Test.cc
index 8befb20..2e64e94 100644
--- a/tests/Token_H_Test.cc
+++ b/tests/Token_H_Test.cc
@@ -8,16 +8,16 @@ BOOST_AUTO_TEST_CASE(token) {
   clang::Index index(0, 0);
 
   clang::TranslationUnit tu(&index, path);
-  clang::SourceLocation start(&tu, path, 0);
-  clang::SourceLocation end(&tu, path, 7, 1);
+  clang::SourceLocation start(tu.tu_, path, 0);
+  clang::SourceLocation end(tu.tu_, path, 7, 1);
 
   clang::SourceRange range(&start, &end);
 
-  clang::Tokens tokens(&tu, &range);
+  clang::Tokens tokens(tu.tu_, &range);
 
   BOOST_CHECK(tokens.size() == 32);
   BOOST_CHECK(tokens[1].kind() == clang::TokenKind::Token_Identifier);
 
-  std::string str = tokens[28].get_token_spelling(&tu);
+  std::string str = tokens[28].get_token_spelling();
   BOOST_CHECK(str == "return");  
 }