libclang: add new StringSet type

This allows the return of a set of CXStrings from libclang.  This is setup work
for an upcoming change to permit returning multiple mangled symbols.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@252852 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang-c/CXString.h b/include/clang-c/CXString.h
index a649cdf82fc78004282e6cde7896050ed1fec2c3..68ab7bc5244c5ac02f0cf2f081ce377428681a79 100644 (file)
--- a/include/clang-c/CXString.h
+++ b/include/clang-c/CXString.h
@@ -40,6 +40,11 @@ typedef struct {
   unsigned private_flags;
 } CXString;
 
+typedef struct {
+  CXString *Strings;
+  unsigned Count;
+} CXStringSet;
+
 /**
  * \brief Retrieve the character data associated with the given string.
  */
@@ -50,6 +55,11 @@ CINDEX_LINKAGE const char *clang_getCString(CXString string);
  */
 CINDEX_LINKAGE void clang_disposeString(CXString string);
 
+/**
+ * \brief Free the given string set.
+ */
+CINDEX_LINKAGE void clang_disposeStringSet(CXStringSet *set);
+
 /**
  * @}
  */

diff --git a/tools/libclang/CXString.cpp b/tools/libclang/CXString.cpp
index dec8ebcd98e147db41230908badc4e1f01fd57f3..ca9989bc21c844a8ef9aaa3f82611ade5b2d0e95 100644 (file)
--- a/tools/libclang/CXString.cpp
+++ b/tools/libclang/CXString.cpp
@@ -112,6 +112,15 @@ CXString createCXString(CXStringBuf *buf) {
   return Str;
 }
 
+CXStringSet *createSet(const std::vector<std::string> &Strings) {
+  CXStringSet *Set = new CXStringSet;
+  Set->Count = Strings.size();
+  Set->Strings = new CXString[Set->Count];
+  for (unsigned SI = 0, SE = Set->Count; SI < SE; ++SI)
+    Set->Strings[SI] = createDup(Strings[SI]);
+  return Set;
+}
+
 
 //===----------------------------------------------------------------------===//
 // String pools.
@@ -175,5 +184,11 @@ void clang_disposeString(CXString string) {
       break;
   }
 }
+
+void clang_disposeStringSet(CXStringSet *set) {
+  delete[] set->Strings;
+  delete set;
+}
+
 } // end: extern "C"
 

diff --git a/tools/libclang/CXString.h b/tools/libclang/CXString.h
index 72ac0cf46914a5dbebcf81074d2d6ea967035328..6473eb2d7103d39486ab20eaba3624563817b68b 100644 (file)
--- a/tools/libclang/CXString.h
+++ b/tools/libclang/CXString.h
@@ -68,6 +68,8 @@ CXString createRef(std::string String) = delete;
 /// \brief Create a CXString object that is backed by a string buffer.
 CXString createCXString(CXStringBuf *buf);
 
+CXStringSet *createSet(const std::vector<std::string> &Strings);
+
 /// \brief A string pool used for fast allocation/deallocation of strings.
 class CXStringPool {
 public:

diff --git a/tools/libclang/libclang.exports b/tools/libclang/libclang.exports
index fd157bc4951eee47495d6ac28db5b2cecfe03ff3..352ba5766ae2255450c67dcf99ff5e7709f383c0 100644 (file)
--- a/tools/libclang/libclang.exports
+++ b/tools/libclang/libclang.exports
@@ -120,6 +120,7 @@ clang_disposeOverriddenCursors
 clang_disposeCXPlatformAvailability
 clang_disposeSourceRangeList
 clang_disposeString
+clang_disposeStringSet
 clang_disposeTokens
 clang_disposeTranslationUnit
 clang_enableStackTraces