merge several libclang

Author: hongxuchen

libclang/CMakeLists.txt

@@ -1,16 +1,12 @@
 set(LIBCLANG_TOOLS
   cc_lookup
   clang_test_it
-  clang_visit
+  match_symbol
   CodeComplete
-  compilation_db
-  diagnose
   diagnosis
   func_sig
-  inclusion_visitor
   libclang_wrapper
   token
-  visit_test
   )
 
 list(APPEND FULL_LLVM_LIBS -lclang)

libclang/cc_lookup/cc_lookup.cc

@@ -1,24 +1,11 @@
-/**
- * @file   cc_lookup.cpp
- * @brief  a simple program to lookup the definition of the cursorbol given its
-* (line, column)
- *
- * @author Hongxu Chen
- * @date   2013-05-01
- */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <clang-c/Index.h>
 
-const int ARG_NUM = 4; /// *test
+const int ARG_NUM = 4;  /// *test
 
-/**
- * \brief a wrapper to print CXString and release the malloc space
- * \c Note that it has not so much functionality
- * @param cx_str the CXString to be printed and disposed
- */
 static inline void printCXString(CXString cx_str) {
   const char* c_str = clang_getCString(cx_str);
   if (c_str) {
@@ -93,12 +80,6 @@ static void printCursor(CXTranslationUnit TU, CXSourceLocation location) {
   }
   CXCursor realCursor = clang_getCanonicalCursor(cursor);
   clang_disposeString(fileName);
-  printf("\n[kind]:");
-  printCXString(clang_getCursorKindSpelling(clang_getCursorKind(cursor)));
-  printf("\n[name]:");
-  printCXString(clang_getCursorDisplayName(cursor));
-  printf("\n[USR]");
-  printCXString(clang_getCursorUSR(cursor));
   printf("\n[doc]");
   printCXString(clang_Cursor_getBriefCommentText(cursor));
   printf("\n[rawdoc]");
@@ -156,7 +137,7 @@ int main(int argc, char* argv[]) {
   }
 
   CXIndex index = clang_createIndex(0, 0);
-  const char* const* clang_args = (const char* const*)(argv + ARG_NUM);
+  const char* const* clang_args = (const char * const*)(argv + ARG_NUM);
   CXTranslationUnit TU = clang_parseTranslationUnit(
       index,
       org_file_name,   // source_filename, 0 if included in command_line_args

libclang/compilation_db/CMakeLists.txt

@@ -1,9 +1,62 @@
 #include "Common.hpp"
 
+#include <clang-c/Index.h>
+#include <clang-c/CXCompilationDatabase.h>
+#include <llvm/Support/raw_ostream.h>
+#include <llvm/Support/Format.h>
+
+#define WITH_COLOR(color, x)         \
+  {                                  \
+    llvm::errs().changeColor(color); \
+    x;                               \
+    llvm::errs().resetColor();       \
+  }
+
+using namespace llvm;
+
 std::string getStrFromCXString(CXString const &cxstring) {
   std::string str;
   char const *cstr = clang_getCString(cxstring);
   if (cstr != nullptr) str = cstr;
   clang_disposeString(cxstring);
   return str;
 }
+
+int DBParser(int argc, char **argv) {
+  if (argc != 2) {
+    errs() << format("%s database_dir\n", argv[0]);
+    exit(1);
+  }
+
+  CXCompilationDatabase_Error error;
+  CXCompilationDatabase db =
+      clang_CompilationDatabase_fromDirectory(argv[1], &error);
+  switch (error) {
+    case CXCompilationDatabase_NoError:
+      break;
+    case CXCompilationDatabase_CanNotLoadDatabase:
+      errs() << "Cannot load database\n";
+      exit(1);
+    default:
+      errs() << "unknown return\n";
+      exit(1);
+  }
+
+  auto cmds = clang_CompilationDatabase_getAllCompileCommands(db);
+  auto numCmds = clang_CompileCommands_getSize(cmds);
+  WITH_COLOR(raw_ostream::BLUE, errs() << numCmds << '\n';);
+  for (auto i = 0U; i < numCmds; i++) {
+    CXCompileCommands cmd = clang_CompileCommands_getCommand(cmds, i);
+    auto numArgs = clang_CompileCommand_getNumArgs(cmd);
+    WITH_COLOR(raw_ostream::YELLOW, errs() << numArgs << '\n');
+    for (auto j = 0U; j < numArgs; j++) {
+      CXString arg = clang_CompileCommand_getArg(cmd, j);
+      errs() << clang_getCString(arg) << '\n';
+      clang_disposeString(arg);
+    }
+  }
+
+  clang_CompileCommands_dispose(cmds);
+  clang_CompilationDatabase_dispose(db);
+  return 0;
+}

libclang/compilation_db/CompilationDatabase.cc

@@ -69,6 +69,8 @@ void CursorInfo::dump() {
 
   errs() << "cursor String: "
          << getStrFromCXString(clang_getCursorSpelling(cursor_)) << '\n';
+  errs() << "cursor DisplayName: "
+         << getStrFromCXString(clang_getCursorDisplayName(cursor_)) << '\n';
   dumpIfNotNullCXStr("cursor USR", clang_getCursorUSR(cursor_));
   if (clang_isPreprocessing(kind_)) {
     if (expand_.filename_.empty()) {

libclang/diagnose/CMakeLists.txt

@@ -26,9 +26,20 @@ struct LocPoint {
   LocPoint &operator=(LocPoint const &) = delete;
 };
 
+struct Comment {
+  std::string comment;
+};
+
+struct XMLComment : Comment {
+  void parser();
+};
+
+struct HTMLComment : Comment {
+  void parser();
+};
+
 class CursorInfo {
   CXCursor cursor_;
-  std::string cursorStr_;
   LocPoint presumed_, expand_, spelling_;
   CXFile included_;
   CXCursor lexParent_, semaParent_, parent_;

libclang/diagnose/diagnose.cc

@@ -57,8 +57,8 @@ enum CXChildVisitResult visitor_f(CXCursor cursor, CXCursor parent,
 }
 
 int main(int argc, char* argv[]) {
-  if (argc < 2) {
-    fprintf(stderr, "Usage:\n\t <-s symbol> <-f file1>[,file2]...\n");
+  if (argc < 5) {
+    fprintf(stderr, "Usage:\n%s <-s symbol> <-f file1>[,file2]...\n", argv[0]);
     return 1;
   }