[cfe-commits] r159493 - in /cfe/trunk/tools/libclang: CIndexCompilationDB.cpp CMakeLists.txt CXCompilationDatabase.cpp

[Arnaud A. de Grandmaison]

Author: aadg
Date: Sat Jun 30 15:43:43 2012
New Revision: 159493

URL: http://llvm.org/viewvc/llvm-project?rev=159493&view=rev
Log:
[libclang] Make implementation filename match the header's name for CXCompilationDatabase

Added:
    cfe/trunk/tools/libclang/CXCompilationDatabase.cpp
      - copied, changed from r159492, cfe/trunk/tools/libclang/CIndexCompilationDB.cpp
Removed:
    cfe/trunk/tools/libclang/CIndexCompilationDB.cpp
Modified:
    cfe/trunk/tools/libclang/CMakeLists.txt

Removed: cfe/trunk/tools/libclang/CIndexCompilationDB.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CIndexCompilationDB.cpp?rev=159492&view=auto
==============================================================================
--- cfe/trunk/tools/libclang/CIndexCompilationDB.cpp (original)
+++ cfe/trunk/tools/libclang/CIndexCompilationDB.cpp (removed)
@@ -1,130 +0,0 @@
-#include "clang-c/CXCompilationDatabase.h"
-#include "clang/Tooling/CompilationDatabase.h"
-#include "CXString.h"
-
-using namespace clang;
-using namespace clang::tooling;
-using namespace clang::cxstring;
-
-extern "C" {
-
-// FIXME: do something more usefull with the error message
-CXCompilationDatabase
-clang_tooling_CompilationDatabase_fromDirectory(
-  const char *BuildDir,
-  CXCompilationDatabase_Error *ErrorCode)
-{
-  std::string ErrorMsg;
-  CXCompilationDatabase_Error Err = CXCompilationDatabase_NoError;
-
-  CompilationDatabase *db = CompilationDatabase::loadFromDirectory(BuildDir,
-                                                                   ErrorMsg);
-
-  if (!db) {
-    fprintf(stderr, "LIBCLANG TOOLING ERROR: %s\n", ErrorMsg.c_str());
-    Err = CXCompilationDatabase_CanNotLoadDatabase;
-  }
-
-  if (ErrorCode)
-    *ErrorCode = Err;
-
-  return db;
-}
-
-void
-clang_tooling_CompilationDatabase_dispose(CXCompilationDatabase CDb)
-{
-  delete static_cast<CompilationDatabase *>(CDb);
-}
-
-struct AllocatedCXCompileCommands
-{
-  std::vector<CompileCommand> CCmd;
-
-  AllocatedCXCompileCommands(const std::vector<CompileCommand>& Cmd)
-    : CCmd(Cmd)
-  { }
-};
-
-CXCompileCommands
-clang_tooling_CompilationDatabase_getCompileCommands(CXCompilationDatabase CDb,
-                                 const char *CompleteFileName)
-{
-  if (CompilationDatabase *db = static_cast<CompilationDatabase *>(CDb)) {
-    const std::vector<CompileCommand>
-      CCmd(db->getCompileCommands(CompleteFileName));
-    if (!CCmd.empty())
-      return new AllocatedCXCompileCommands( CCmd );
-  }
-
-  return 0;
-}
-
-void
-clang_tooling_CompileCommands_dispose(CXCompileCommands Cmds)
-{
-  delete static_cast<AllocatedCXCompileCommands *>(Cmds);
-}
-
-unsigned
-clang_tooling_CompileCommands_getSize(CXCompileCommands Cmds)
-{
-  if (!Cmds)
-    return 0;
-
-  AllocatedCXCompileCommands *ACC =
-    static_cast<AllocatedCXCompileCommands *>(Cmds);
-
-  return ACC->CCmd.size();
-}
-
-CXCompileCommand
-clang_tooling_CompileCommands_getCommand(CXCompileCommands Cmds, unsigned I)
-{
-  if (!Cmds)
-    return 0;
-
-  AllocatedCXCompileCommands *ACC =
-    static_cast<AllocatedCXCompileCommands *>(Cmds);
-
-  if (I >= ACC->CCmd.size())
-    return 0;
-
-  return &ACC->CCmd[I];
-}
-
-CXString
-clang_tooling_CompileCommand_getDirectory(CXCompileCommand CCmd)
-{
-  if (!CCmd)
-    return createCXString((const char*)NULL);
-
-  CompileCommand *cmd = static_cast<CompileCommand *>(CCmd);
-  return createCXString(cmd->Directory);
-}
-
-unsigned
-clang_tooling_CompileCommand_getNumArgs(CXCompileCommand CCmd)
-{
-  if (!CCmd)
-    return 0;
-
-  return static_cast<CompileCommand *>(CCmd)->CommandLine.size();
-}
-
-CXString
-clang_tooling_CompileCommand_getArg(CXCompileCommand CCmd, unsigned Arg)
-{
-  if (!CCmd)
-    return createCXString((const char*)NULL);
-
-  CompileCommand *Cmd = static_cast<CompileCommand *>(CCmd);
-
-  if (Arg >= Cmd->CommandLine.size())
-    return createCXString((const char*)NULL);
-
-  return createCXString(Cmd->CommandLine[Arg]);
-}
-
-
-} // end: extern "C"

Modified: cfe/trunk/tools/libclang/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CMakeLists.txt?rev=159493&r1=159492&r2=159493&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/CMakeLists.txt (original)
+++ cfe/trunk/tools/libclang/CMakeLists.txt Sat Jun 30 15:43:43 2012
@@ -8,7 +8,6 @@
   CIndex.cpp
   CIndexCXX.cpp
   CIndexCodeCompletion.cpp
-  CIndexCompilationDB.cpp
   CIndexDiagnostic.cpp
   CIndexDiagnostic.h
   CIndexHigh.cpp
@@ -18,6 +17,7 @@
   CIndexer.h
   CXCursor.cpp
   CXCursor.h
+  CXCompilationDatabase.cpp
   CXLoadedDiagnostic.cpp
   CXLoadedDiagnostic.h
   CXSourceLocation.cpp

Copied: cfe/trunk/tools/libclang/CXCompilationDatabase.cpp (from r159492, cfe/trunk/tools/libclang/CIndexCompilationDB.cpp)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/CXCompilationDatabase.cpp?p2=cfe/trunk/tools/libclang/CXCompilationDatabase.cpp&p1=cfe/trunk/tools/libclang/CIndexCompilationDB.cpp&r1=159492&r2=159493&rev=159493&view=diff
==============================================================================
    (empty)