More cleanup.

src/CodeCompleteResults.cc

@@ -3,11 +3,9 @@
 #include <exception>
 
 clang::CodeCompleteResults::
-CodeCompleteResults(CXTranslationUnit &cx_tu,
+CodeCompleteResults(CXTranslationUnit &cx_tu, const std::string &file_name,
-                    const std::string &file_name,
                     const std::map<std::string, std::string>  &buffers,
-                    int line_num,
+                    unsigned line_num, unsigned column) {
-                    int column) {
   std::vector<CXUnsavedFile> files;
   for (auto &buffer : buffers) {
     CXUnsavedFile file;
@@ -31,15 +29,15 @@ clang::CodeCompleteResults::~CodeCompleteResults() {
   delete cx_results;
 }
 
-int clang::CodeCompleteResults::
+unsigned clang::CodeCompleteResults::
 size() {
   return cx_results->NumResults;
 }
 
 clang::CompletionString clang::CodeCompleteResults::
-get(int i) {
+get(unsigned i) {
   if (i >= size()) {
-    throw std::invalid_argument("clang::CodeCompleteResults::get(int i): i>=size()");
+    throw std::invalid_argument("clang::CodeCompleteResults::get(unsigned i): i>=size()");
   }
   return CompletionString(cx_results->Results[i].CompletionString);
 }

src/CodeCompleteResults.h

@@ -6,15 +6,14 @@
 
 namespace clang {
   class CodeCompleteResults {
-  public:
+    friend class TranslationUnit;
-    CodeCompleteResults(CXTranslationUnit &cx_tu,
+    CodeCompleteResults(CXTranslationUnit &cx_tu, const std::string &file_name,
-                        const std::string &file_name,
                         const std::map<std::string, std::string>  &buffers,
-                        int line_num,
+                        unsigned line_num, unsigned column);
-                        int column);
+  public:
     ~CodeCompleteResults();
-    CompletionString get(int index);
+    CompletionString get(unsigned index);
-    int size();
+    unsigned size();
 
     CXCodeCompleteResults *cx_results;
   };

src/Diagnostic.cc

@@ -10,8 +10,8 @@ clang::Diagnostic::Diagnostic(CXTranslationUnit& cx_tu, CXDiagnostic& cx_diagnos
   clang_disposeString(cxstr);
   clang::SourceLocation start_location(clang_getDiagnosticLocation(cx_diagnostic));
   
-  unsigned start_offset;
+  path=start_location.get_path();
-  start_location.get_data(&path, NULL, NULL, &start_offset);
+  unsigned start_offset=start_location.get_offset();
   clang::Tokens tokens(cx_tu, SourceRange(start_location, start_location));
   if(tokens.size()==1) {
     offsets=std::pair<unsigned, unsigned>(start_offset, tokens[0].offsets.second);

src/Diagnostic.h

@@ -7,9 +7,9 @@
 
 namespace clang {
   class Diagnostic {
-  public:
+    friend class TranslationUnit;
     Diagnostic(CXTranslationUnit& cx_tu, CXDiagnostic& cx_diagnostic);
-    
+  public:
     static const std::string get_severity_spelling(unsigned severity);
 
     unsigned severity;

src/SourceLocation.cc

@@ -3,21 +3,22 @@
 // // // // // // // //
 //  SourceLocation   //
 // // // // // // // //
-clang::SourceLocation::
+clang::SourceLocation::SourceLocation(CXTranslationUnit &tu, const std::string &filepath, unsigned offset) {
-SourceLocation(CXTranslationUnit &tu,
-               const std::string &filename,
-               int line_number,
-               int line_offset) {
-  CXFile file = clang_getFile(tu, filename.c_str());
-  cx_location = clang_getLocation(tu, file, line_number, line_offset);
-}
-
-clang::SourceLocation::
-SourceLocation(CXTranslationUnit &tu, const std::string &filepath, int offset) {
   CXFile file = clang_getFile(tu, filepath.c_str());
   cx_location = clang_getLocationForOffset(tu, file, offset);
 }
 
+std::string clang::SourceLocation::get_path() {
+  std::string path;
+  get_data(&path, NULL, NULL, NULL);
+  return path;
+}
+unsigned clang::SourceLocation::get_offset() {
+  unsigned offset;
+  get_data(NULL, NULL, NULL, &offset);
+  return offset;
+}
+
 void clang::SourceLocation::get_data(std::string* path, unsigned *line, unsigned *column, unsigned *offset) {
   if(path==nullptr)
     clang_getExpansionLocation(cx_location, NULL, line, column, offset);

src/SourceLocation.h

@@ -6,19 +6,19 @@
 namespace clang {
   
   class SourceLocation {
+    friend class TranslationUnit;
+    SourceLocation(CXTranslationUnit &tu, const std::string &filepath, unsigned offset);
   public:
     SourceLocation(const CXSourceLocation& cx_location) : cx_location(cx_location) {}
 
-    SourceLocation(CXTranslationUnit &cx_tu,
+  public:
-                   const std::string &filename,
+    std::string get_path();
-                   int line_number,
+    unsigned get_offset();
-                   int column);
 
-    SourceLocation(CXTranslationUnit &tu, const std::string &filepath, int offset);
+    CXSourceLocation cx_location;
     
+  private:
     void get_data(std::string *path, unsigned *line, unsigned *column, unsigned *offset);
-
-    CXSourceLocation cx_location;
   };
 
 }  // namespace clang

src/SourceRange.cc

@@ -8,7 +8,7 @@ SourceRange(clang::SourceLocation &start, clang::SourceLocation &end) {
 std::pair<unsigned, unsigned> clang::SourceRange::get_offsets() {
   SourceLocation start(clang_getRangeStart(cx_range)), end(clang_getRangeEnd(cx_range));
   std::pair<unsigned, unsigned> offsets;
-  start.get_data(NULL, NULL, NULL, &offsets.first);
+  offsets.first=start.get_offset();
-  end.get_data(NULL, NULL, NULL, &offsets.second);
+  offsets.second=end.get_offset();
   return offsets;
 }

src/Token.h

@@ -22,6 +22,7 @@ namespace clang {
     const TokenKind get_kind();
     std::string get_spelling();
     SourceLocation get_source_location();
+    SourceRange get_source_range();
     clang::Cursor get_cursor() {return clang::Cursor(cx_cursor);}
     bool has_type();
     std::string get_type();
@@ -30,8 +31,6 @@ namespace clang {
     CXToken& cx_token;
     CXCursor& cx_cursor;
     std::pair<unsigned, unsigned> offsets;
-  private:
-    SourceRange get_source_range();
   };
 }  // namespace clang
 #endif  // TOKEN_H_

src/Tokens.h

@@ -8,8 +8,10 @@
 
 namespace clang {
   class Tokens : public std::vector<clang::Token> {
-  public:
+    friend class TranslationUnit;
+    friend class Diagnostic;
     Tokens(CXTranslationUnit &cx_tu, const SourceRange &range);
+  public:
     ~Tokens();
     std::vector<std::pair<unsigned, unsigned> > get_similar_token_offsets(clang::Token& token);
   private:

src/TranslationUnit.cc

@@ -90,7 +90,7 @@ unsigned clang::TranslationUnit::DefaultFlags() {
   return CXTranslationUnit_CacheCompletionResults | CXTranslationUnit_PrecompiledPreamble | CXTranslationUnit_Incomplete | CXTranslationUnit_IncludeBriefCommentsInCodeCompletion;
 }
 
-clang::CodeCompleteResults clang::TranslationUnit::get_code_completions(const std::map<std::string, std::string> &buffers, int line_number, int column) {
+clang::CodeCompleteResults clang::TranslationUnit::get_code_completions(const std::map<std::string, std::string> &buffers, unsigned line_number, unsigned column) {
   auto cxstr=clang_getTranslationUnitSpelling(cx_tu);
   std::string path=clang_getCString(cxstr);
   clang_disposeString(cxstr);

src/TranslationUnit.h

@@ -35,7 +35,7 @@ namespace clang {
                const std::map<std::string, std::string> &buffers,
                unsigned flags=DefaultFlags());
                
-   clang::CodeCompleteResults get_code_completions(const std::map<std::string, std::string> &buffers, int line_number, int column);
+   clang::CodeCompleteResults get_code_completions(const std::map<std::string, std::string> &buffers, unsigned line_number, unsigned column);
    std::vector<clang::Diagnostic> get_diagnostics();
    std::unique_ptr<Tokens> get_tokens(unsigned start_offset, unsigned end_offset);
    clang::Cursor get_cursor(std::string path, unsigned offset);