Merge branch 'master' of https://github.com/cppit/libclangmm

CMakeLists.txt

@@ -1,13 +1,15 @@
 cmake_minimum_required (VERSION 2.8.4)
 set(project_name clangmm)
 project(${project_name})
-set(library_installation_path "/usr/local/lib/libclangmm/")
+set(library_path "/usr/local/lib/")
+set(include_path "/usr/local/include/")
 
 if(APPLE)
   set(Boost_USE_STATIC_LIBS "YES")
   set(CMAKE_MACOSX_RPATH 1)
 endif()
 
-enable_testing()
 add_subdirectory(src)
-add_subdirectory(tests)
+
+# enable_testing()
+# add_subdirectory(tests)

README.md

@@ -1,96 +1,30 @@
 # libclangmm - An easy to use C++-wrapper for libclang #
 
 ## About ##
-This project is written by *cppit* as part of an bachelor thesis
+This is a highlevel wrapper for [libclang](http://www.llvm.org). It
+provides highlevel C++11 access to complicated C code.
 
-# Install #
-This section describes how to install this library on your system. The section below is tested in on unix based systems and in windows. If there are any problems please create an issue and we will look into it.
 ## Dependencies ##
-Please install these dependencies on your system.
-
 * libclang
-* cmake
-* make
-* clang or gcc (compiler)
-
-## Download the source ##
-There are two ways of downloading the source
-
-### Download the zip ###
-You can download the zip [here](https://github.com/cppit/libclangmm/archive/master.zip).
-
-### Cloning the repository ###
-
-```sh
-$ git clone https://github.com/cppit/libclangmm.git
-
-```
-
 
 ## Installation ##
+See [installation guide](https://github.com/cppit/libclangmm/blob/master/docs/install.md)
 
+### Quickstart ###
 ```sh
-$ cmake .
+$ git clone https://github.com/cppit/libclangmm.git clangmm
-$ make install
+$ cd clangmm
+$ make
+$ sudo make install
 ```
-**Notice:** *make install* needs root privileges
+# Tests #
-
+The compilation of the tests are disabled due to ease of installation. Simply enter CMakeList.txt and uncomment the last two lines in the file to enable testing.
-# Usage #
-One quick start:
-
-```cpp
-  // lets say it is empty
-  std::string path("your file here");
-
-  clang::Index index(0, 0);
-  clang::TranslationUnit tu(&index, path);
-
-  // ReparseTranslationUnit takes a map with filepath as key
-  // and buffer as value
-  std::map<std::string, std::string> buffers;
-  
-  // create buffer (this would normally be a gtk/qt-buffer or something)
-  std::string file;
-  file.append("#include <iostream>");
-  file.append("int main(int argc, char *argv[]) {\n");
-  file.append("std::cout << \"Hello World!\" << std::endl;\n");
-  file.append("return 0\n");
-  file.append("}");
-
-  buffers[path] = file;
-
-  // after you can use various methods to get locations 
-  // for tokens for syntax highlighting of refactoring
-
-  // the buffer map should contain all open files. I.e in an text editor
-  // you could have more than one file open at the same time. Putting the
-  // files in this std::map will make the translationunit be reparsed
-  // from memory instead of from file.
-  tu.ReparseTranslationUnit(path, buffers);
-
-  // zero is the start of the buffer
-  clang::SourceLocation start(&tu, path, 0);
-
-  // the 129 value is arbitrary, you must set it to the size of your
-  // buffer (the number of chars in the buffer)
-  clang::SourceLocation end(&tu, path, 129);
-
-  clang::SourceRange range(&start, &end);
-  clang::Tokens tokens(&tu, &range);
 
-  // now tokens are stored in "tokens" we can extract ranges that are
+```sh
-  // comments for instance
+# enable_testing()
-  std::vector<clang::SourceRange> ranges;
+# add_subdirectory(tests)
-  for (auto &t : tokens.tokens()) {
-    if (t.kind() == clang::Token_Comment) {
-      ranges.emplace_back(&tu, &t);
-    }
-  }
 ```
-For more examples see tests/
+Then simply: 
-
-# Tests #
-To run tests simply do the following:
 ```sh
 $ cmake .
 $ make

docs/install.md

@@ -0,0 +1,13 @@
+# Installation guide #
+
+## Debian/Ubuntu
+```sh
+$ sudo apt-get install libclang-dev make cmake gcc
+```
+
+```sh
+$ git clone https://github.com/cppit/libclangmm.git clangmm
+$ cd clangmm
+$ make
+$ sudo make install
+```

src/CMakeLists.txt

@@ -26,6 +26,7 @@ set(header_files
   Tokens.h              
   TranslationUnit.h
   Diagnostic.h
+  Utility.h
   )
 set(cc_files
   CodeCompleteResults.cc
@@ -41,6 +42,7 @@ set(cc_files
   Tokens.cc             
   TranslationUnit.cc
   Diagnostic.cc
+  Utility.cc
   )
 
 add_library(${project_name} SHARED ${header_files} ${cc_files})
@@ -48,7 +50,5 @@ add_library(${project_name} SHARED ${header_files} ${cc_files})
 include_directories(${LIBCLANG_INCLUDE_DIRS})
 target_link_libraries(${project_name} ${LIBCLANG_LIBRARIES})
 
-install(TARGETS ${project_name}
+install(TARGETS ${project_name} LIBRARY DESTINATION ${library_path})
-  LIBRARY DESTINATION ${library_installation_path})
+install(FILES ${header_files} DESTINATION ${include_path}/libclangmm)
-install(FILES ${header_files}
-  DESTINATION ${library_installation_path}/include)

src/CompileCommand.cc

@@ -1,12 +1,13 @@
 #include "CompileCommand.h"
 #include "CompileCommands.h"
+#include "Utility.h"
 
 std::string clang::CompileCommand::
 get_command() {
   std::string res;
   unsigned N = clang_CompileCommand_getNumArgs(cx_command);
   for (unsigned i = 0; i < N; i++) {
-    res += clang_getCString(clang_CompileCommand_getArg(cx_command, i));
+    res += clang::to_string(clang_CompileCommand_getArg(cx_command, i));
   }
   return res;
 }
@@ -16,7 +17,7 @@ get_command_as_args() {
   unsigned N = clang_CompileCommand_getNumArgs(cx_command);
   std::vector<std::string> res(N);
   for (unsigned i = 0; i < N; i++) {
-    res[i] = clang_getCString(clang_CompileCommand_getArg(cx_command, i));
+    res[i] = clang::to_string(clang_CompileCommand_getArg(cx_command, i));
   }
   return res;
 }

src/CompletionString.cc

@@ -1,34 +1,27 @@
 #include "CompletionString.h"
+#include "Utility.h"
 
 clang::CompletionString::
-CompletionString(const CXCompletionString &cx_str) : cx_str(cx_str) {}
+CompletionString(const CXCompletionString &cx_completion_sting) : cx_completion_sting(cx_completion_sting) {}
 
 bool clang::CompletionString::available() {
-  return clang_getCompletionAvailability(cx_str) == CXAvailability_Available;
+  return clang_getCompletionAvailability(cx_completion_sting) == CXAvailability_Available;
 }
 
 unsigned clang::CompletionString::get_num_chunks() {
-    return clang_getNumCompletionChunks(cx_str);
+    return clang_getNumCompletionChunks(cx_completion_sting);
 }
 
 std::vector<clang::CompletionChunk> clang::CompletionString::get_chunks() {
   std::vector<clang::CompletionChunk> res;
   for (unsigned i = 0; i < get_num_chunks(); i++) {
-    auto cxstr=clang_getCompletionChunkText(cx_str, i);
+    res.emplace_back(clang::to_string(clang_getCompletionChunkText(cx_completion_sting, i)), static_cast<CompletionChunkKind> (clang_getCompletionChunkKind(cx_completion_sting, i)));
-    res.emplace_back(clang_getCString(cxstr), static_cast<CompletionChunkKind> (clang_getCompletionChunkKind(cx_str, i)));
-    clang_disposeString(cxstr);
   }
   return res;
 }
 
 std::string clang::CompletionString::get_brief_comments() {
-  std::string brief_comments;
+  return clang::to_string(clang_getCompletionBriefComment(cx_completion_sting));
-  auto cxstr=clang_getCompletionBriefComment(cx_str);
-  if(cxstr.data!=NULL) {
-    brief_comments=clang_getCString(cxstr);
-    clang_disposeString(cxstr);
-  }
-  return brief_comments;
 }
 
 clang::CompletionChunk::

src/CompletionString.h

@@ -28,13 +28,13 @@ namespace clang {
 
   class CompletionString {
   public:
-    explicit CompletionString(const CXCompletionString &cx_str);
+    explicit CompletionString(const CXCompletionString &cx_completion_sting);
     bool available();
     std::vector<CompletionChunk> get_chunks();
     std::string get_brief_comments();
     unsigned get_num_chunks();
     
-    CXCompletionString cx_str;
+    CXCompletionString cx_completion_sting;
   };
 }  // namespace clang
 #endif  // COMPLETIONSTRING_H_

src/Cursor.cc

@@ -1,4 +1,5 @@
 #include "Cursor.h"
+#include "Utility.h"
 
 const clang::CursorKind clang::Cursor::get_kind() {
   return (CursorKind) clang_getCursorKind(this->cx_cursor);
@@ -13,10 +14,7 @@ clang::SourceRange clang::Cursor::get_source_range() const {
 }
 
 std::string clang::Cursor::get_usr() const {
-  auto cxstr=clang_getCursorUSR(cx_cursor);
+  return clang::to_string(clang_getCursorUSR(cx_cursor));
-  std::string USR=clang_getCString(cxstr);
-  clang_disposeString(cxstr);
-  return USR;
 }
 
 clang::Cursor clang::Cursor::get_referenced() const {

src/Diagnostic.cc

@@ -1,20 +1,19 @@
 #include "Diagnostic.h"
 #include "SourceLocation.h"
 #include "Tokens.h"
+#include "Utility.h"
 
 clang::Diagnostic::Diagnostic(CXTranslationUnit& cx_tu, CXDiagnostic& cx_diagnostic) {
   severity=clang_getDiagnosticSeverity(cx_diagnostic);
   severity_spelling=get_severity_spelling(severity);
-  auto cxstr=clang_getDiagnosticSpelling(cx_diagnostic);
+  spelling=clang::to_string(clang_getDiagnosticSpelling(cx_diagnostic));
-  spelling=clang_getCString(cxstr);
-  clang_disposeString(cxstr);
   clang::SourceLocation start_location(clang_getDiagnosticLocation(cx_diagnostic));
   
   path=start_location.get_path();
   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);
+    offsets=std::pair<unsigned, unsigned>(start_offset, tokens.begin()->offsets.second);
   }
 }
 

src/SourceLocation.cc

@@ -1,4 +1,5 @@
 #include "SourceLocation.h"
+#include "Utility.h"
 
 // // // // // // // //
 //  SourceLocation   //
@@ -26,9 +27,7 @@ void clang::SourceLocation::get_data(std::string* path, unsigned *line, unsigned
     CXFile file;
     clang_getExpansionLocation(cx_location, &file, line, column, offset);
     if (file!=NULL) {
-      auto cxstr=clang_getFileName(file);
+      *path=clang::to_string(clang_getFileName(file));
-      *path=clang_getCString(cxstr);
-      clang_disposeString(cxstr);
     }
   }
 }

src/Token.cc

@@ -1,4 +1,5 @@
 #include "Token.h"
+#include "Utility.h"
 
 // // // // //
 //  Token   //
@@ -16,8 +17,7 @@ clang::SourceRange clang::Token::get_source_range() {
 }
 // returns a string description of this tokens kind
 std::string clang::Token::get_spelling() {
-  CXString s = clang_getTokenSpelling(cx_tu, cx_token);
+  return clang::to_string(clang_getTokenSpelling(cx_tu, cx_token));
-  return std::string(clang_getCString(s));
 }
 
 const clang::TokenKind clang::Token::get_kind() {
@@ -30,9 +30,7 @@ bool clang::Token::has_type() {
   if(clang_Cursor_isNull(referenced))
     return false;
   auto type=clang_getCursorType(referenced);
-  auto cxstr=clang_getTypeSpelling(type);
+  auto spelling=clang::to_string(clang_getTypeSpelling(type));
-  std::string spelling=clang_getCString(cxstr);
-  clang_disposeString(cxstr);
   return spelling!="";
 }
 
@@ -41,17 +39,13 @@ std::string clang::Token::get_type() {
   auto referenced=clang_getCursorReferenced(cx_cursor);
   if(!clang_Cursor_isNull(referenced)) {
     auto type=clang_getCursorType(referenced);
-    auto cxstr=clang_getTypeSpelling(type);
+    spelling=clang::to_string(clang_getTypeSpelling(type));
-    spelling=clang_getCString(cxstr);
-    clang_disposeString(cxstr);
     std::string auto_end="";
     //TODO fix const auto
     if((spelling.size()>=4 && spelling.substr(0, 4)=="auto")) {
       auto_end=spelling.substr(4);
       auto type=clang_getCanonicalType(clang_getCursorType(cx_cursor));
-      auto cxstr=clang_getTypeSpelling(type);
+      spelling=clang::to_string(clang_getTypeSpelling(type));
-      spelling=clang_getCString(cxstr);
-      clang_disposeString(cxstr);
       if(spelling.find(" ")==std::string::npos)
         spelling+=auto_end;
     }
@@ -59,57 +53,11 @@ std::string clang::Token::get_type() {
   return spelling;
 }
 
-//TODO: use clang_Cursor_getBriefCommentText
 std::string clang::Token::get_brief_comments() {
   std::string comment_string;
-  auto referenced=clang_getCursorReferenced(cx_cursor);
+  auto referenced=get_cursor().get_referenced();
-  auto comment=clang_Cursor_getParsedComment(referenced);
+  if(referenced) {
-  if(clang_Comment_getKind(comment)==CXComment_FullComment) {
+    comment_string=clang::to_string(clang_Cursor_getBriefCommentText(referenced.cx_cursor));
-    size_t para_c=0;
-    for(unsigned c=0;c<clang_Comment_getNumChildren(comment);c++) {
-      auto child_comment=clang_Comment_getChild(comment, c);
-      if(clang_Comment_getKind(child_comment)==CXComment_Paragraph) {
-        para_c++;
-        if(para_c>=2)
-          break;
-        for(unsigned c=0;c<clang_Comment_getNumChildren(child_comment);c++) {
-          auto grandchild_comment=clang_Comment_getChild(child_comment, c);
-          if(clang_Comment_getKind(grandchild_comment)==CXComment_Text) {
-            auto cxstr=clang_TextComment_getText(grandchild_comment);
-            comment_string+=clang_getCString(cxstr);
-            comment_string+="\n";
-            clang_disposeString(cxstr);
-            size_t dot_position=comment_string.find(".");
-            if(dot_position!=std::string::npos)
-              return comment_string.substr(0, dot_position);
-          }
-          if(clang_Comment_getKind(grandchild_comment)==CXComment_InlineCommand) {
-            auto cxstr=clang_InlineCommandComment_getCommandName(grandchild_comment);
-            if(comment_string.size()>0)
-              comment_string.pop_back();
-            if(clang_InlineCommandComment_getNumArgs(grandchild_comment)==0)
-              comment_string+=clang_getCString(cxstr);
-            clang_disposeString(cxstr);
-            for(unsigned arg_c=0;arg_c<clang_InlineCommandComment_getNumArgs(grandchild_comment);arg_c++) {
-              auto cxstr=clang_InlineCommandComment_getArgText(grandchild_comment, arg_c);
-              if(cxstr.data!=NULL) {
-                if(arg_c>0)
-                  comment_string+=" ";
-                comment_string+=clang_getCString(cxstr);
-                clang_disposeString(cxstr);
-              }
-            }
-          }
-        }
-      }
-      /*cout << "  " << clang_Comment_getKind(child_comment) << ", children: " << clang_Comment_getNumChildren(child_comment) << endl;
-      auto cxstr=clang_FullComment_getAsHTML(child_comment);
-      cout << "  " << clang_getCString(cxstr) << endl;
-      clang_disposeString(cxstr);*/
-    }
-    while(comment_string.size()>0 && (comment_string.back()=='\n' || comment_string.back()==' '))
-      comment_string.pop_back();
   }
-  
   return comment_string;
 }

src/Tokens.cc

@@ -1,11 +1,12 @@
 #include "Tokens.h"
+#include "Utility.h"
 #include <iostream>
 using namespace std;
 
 clang::Tokens::Tokens(CXTranslationUnit &cx_tu, const SourceRange &range): cx_tu(cx_tu) {
   clang_tokenize(cx_tu, range.cx_range, &cx_tokens, &num_tokens);
   cx_cursors.clear();
-  cx_cursors.reserve(num_tokens);
+  cx_cursors.resize(num_tokens);
   clang_annotateTokens(cx_tu, cx_tokens, num_tokens, cx_cursors.data());
   for (unsigned i = 0; i < num_tokens; i++) {
     emplace_back(Token(cx_tu, cx_tokens[i], cx_cursors[i]));
@@ -19,15 +20,13 @@ clang::Tokens::~Tokens() {
 //This works across TranslationUnits! However, to get rename refactoring to work, 
 //one have to open all the files that might include a similar token
 //Similar tokens defined as tokens with equal referenced cursors. 
-std::vector<std::pair<unsigned, unsigned> > clang::Tokens::get_similar_token_offsets(clang::Token& token) {
+std::vector<std::pair<unsigned, unsigned> > clang::Tokens::get_similar_token_offsets(const std::string &usr) {
   std::vector<std::pair<unsigned, unsigned> > offsets;
-  auto referenced=token.get_cursor().get_referenced();
+  for(auto &token: *this) {
-  if(referenced) {
+    if(token.get_kind()==clang::Token_Identifier) {
-    auto referenced_usr=referenced.get_usr();
+      auto referenced=token.get_cursor().get_referenced();
-    for(auto &a_token: *this) {
+      if(referenced && usr==referenced.get_usr()) {
-      auto a_referenced=a_token.get_cursor().get_referenced();
+        offsets.emplace_back(token.offsets);
-      if(a_referenced && referenced_usr==a_referenced.get_usr() && token.get_spelling()==a_token.get_spelling()) {
-        offsets.emplace_back(a_token.offsets);
       }
     }
   }
@@ -45,12 +44,9 @@ std::vector<std::pair<std::string, unsigned> > clang::Tokens::get_cxx_methods()
         auto offset=cursor.get_source_location().get_offset();
         if(offset!=last_offset) {
           std::string method;
-          CXString cxstr;
           if(kind==clang::CursorKind::CXXMethod) {
             auto type=clang_getResultType(clang_getCursorType(cursor.cx_cursor));
-            auto cxstr=clang_getTypeSpelling(type);
+            method+=clang::to_string(clang_getTypeSpelling(type));
-            method+=clang_getCString(cxstr);
-            clang_disposeString(cxstr);
             auto pos=method.find(" ");
             if(pos!=std::string::npos)
               method.erase(pos, 1);
@@ -58,15 +54,11 @@ std::vector<std::pair<std::string, unsigned> > clang::Tokens::get_cxx_methods()
           }
           
           clang::Cursor parent(clang_getCursorSemanticParent(cursor.cx_cursor));
-          cxstr=clang_getCursorDisplayName(parent.cx_cursor);
+          method+=clang::to_string(clang_getCursorDisplayName(parent.cx_cursor));
-          method+=clang_getCString(cxstr);
-          clang_disposeString(cxstr);
           
           method+="::";
           
-          cxstr=clang_getCursorDisplayName(cursor.cx_cursor);
+          method+=clang::to_string(clang_getCursorDisplayName(cursor.cx_cursor));
-          method+=clang_getCString(cxstr);
-          clang_disposeString(cxstr);
           methods.emplace_back(method, offset);
         }
         last_offset=offset;

src/Tokens.h

@@ -13,7 +13,7 @@ namespace clang {
     Tokens(CXTranslationUnit &cx_tu, const SourceRange &range);
   public:
     ~Tokens();
-    std::vector<std::pair<unsigned, unsigned> > get_similar_token_offsets(clang::Token& token);
+    std::vector<std::pair<unsigned, unsigned> > get_similar_token_offsets(const std::string &usr);
     std::vector<std::pair<std::string, unsigned> > get_cxx_methods();
   private:
     CXToken *cx_tokens;

src/TranslationUnit.cc

@@ -1,6 +1,7 @@
 #include "TranslationUnit.h"
 #include "SourceLocation.h"
 #include "Tokens.h"
+#include "Utility.h"
 #include <fstream>
 #include <sstream>
 
@@ -91,9 +92,7 @@ unsigned clang::TranslationUnit::DefaultFlags() {
 }
 
 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);
+  auto path=clang::to_string(clang_getTranslationUnitSpelling(cx_tu));
-  std::string path=clang_getCString(cxstr);
-  clang_disposeString(cxstr);
 
   clang::CodeCompleteResults results(cx_tu, path, buffers, line_number, column);
   return results;
@@ -110,9 +109,7 @@ std::vector<clang::Diagnostic> clang::TranslationUnit::get_diagnostics() {
 }
 
 std::unique_ptr<clang::Tokens> clang::TranslationUnit::get_tokens(unsigned start_offset, unsigned end_offset) {
-  auto cxstr=clang_getTranslationUnitSpelling(cx_tu);
+  auto path=clang::to_string(clang_getTranslationUnitSpelling(cx_tu));
-  std::string path=clang_getCString(cxstr);
-  clang_disposeString(cxstr);
   clang::SourceLocation start_location(cx_tu, path, start_offset);
   clang::SourceLocation end_location(cx_tu, path, end_offset);
   clang::SourceRange range(start_location, end_location);

src/Utility.cc

@@ -0,0 +1,10 @@
+#include "Utility.h"
+
+std::string clang::to_string(CXString cx_string) {
+  std::string string;
+  if(cx_string.data!=NULL) {
+    string=clang_getCString(cx_string);
+    clang_disposeString(cx_string);
+  }
+  return string;
+}

src/Utility.h

@@ -0,0 +1,10 @@
+#ifndef UTILITY_H_
+#define UTILITY_H_
+#include <clang-c/Index.h>
+#include <string>
+
+namespace clang {
+  std::string to_string(CXString cx_string);
+}
+
+#endif  // UTILITY_H_

src/clangmm.h

@@ -13,4 +13,5 @@
 #include "Index.h"
 #include "Cursor.h"
 #include "Diagnostic.h"
+#include "Utility.h"
 #endif  // CLANGMM_H_

src/docs/windows-install.md

@@ -1,13 +0,0 @@
-# Windows Install Guide #
-## Requirements ##
-
-```bash
-* chocolatey [website](http://chocolatey.org)
-```
-
-##Preperation ##
-First you install some dependencies
-
-```bash
-PS: choco install cmake make nmake
-```