[cfe-commits] r93212 - in /cfe/trunk/tools/CIndex: CIndex.cpp CIndexer.h

[Ted Kremenek]

Author: kremenek
Date: Mon Jan 11 18:36:38 2010
New Revision: 93212

URL: http://llvm.org/viewvc/llvm-project?rev=93212&view=rev
Log:
Make createCXString() a static member function of class CIndex.

Modified:
    cfe/trunk/tools/CIndex/CIndex.cpp
    cfe/trunk/tools/CIndex/CIndexer.h

Modified: cfe/trunk/tools/CIndex/CIndex.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndex.cpp?rev=93212&r1=93211&r2=93212&view=diff

==============================================================================
--- cfe/trunk/tools/CIndex/CIndex.cpp (original)
+++ cfe/trunk/tools/CIndex/CIndex.cpp Mon Jan 11 18:36:38 2010
@@ -416,7 +416,7 @@
   }
 }
 
-static CXString createCXString(const char *String, bool DupString = false) {
+CXString CIndexer::CIndexer::createCXString(const char *String, bool DupString){
   CXString Str;
   if (DupString) {
     Str.Spelling = strdup(String);
@@ -579,7 +579,8 @@
 CXString clang_getTranslationUnitSpelling(CXTranslationUnit CTUnit) {
   assert(CTUnit && "Passed null CXTranslationUnit");
   ASTUnit *CXXUnit = static_cast<ASTUnit *>(CTUnit);
-  return createCXString(CXXUnit->getOriginalSourceFileName().c_str(), true);
+  return CIndexer::createCXString(CXXUnit->getOriginalSourceFileName().c_str(),
+                                  true);
 }
 
 void clang_loadTranslationUnit(CXTranslationUnit CTUnit,
@@ -633,18 +634,19 @@
   NamedDecl *ND = static_cast<NamedDecl *>(AnonDecl);
 
   if (ObjCMethodDecl *OMD = dyn_cast<ObjCMethodDecl>(ND))
-    return createCXString(OMD->getSelector().getAsString().c_str(), true);
+    return CIndexer::createCXString(OMD->getSelector().getAsString().c_str(),
+                                    true);
 
   if (ObjCCategoryImplDecl *CIMP = dyn_cast<ObjCCategoryImplDecl>(ND))
     // No, this isn't the same as the code below. getIdentifier() is non-virtual
     // and returns different names. NamedDecl returns the class name and
     // ObjCCategoryImplDecl returns the category name.
-    return createCXString(CIMP->getIdentifier()->getNameStart());
+    return CIndexer::createCXString(CIMP->getIdentifier()->getNameStart());
 
   if (ND->getIdentifier())
-    return createCXString(ND->getIdentifier()->getNameStart());
+    return CIndexer::createCXString(ND->getIdentifier()->getNameStart());
 
-  return createCXString("");
+  return CIndexer::createCXString("");
 }
 
 unsigned clang_getDeclLine(CXDecl AnonDecl) {
@@ -759,28 +761,29 @@
     case CXCursor_ObjCSuperClassRef: {
       ObjCInterfaceDecl *OID = dyn_cast<ObjCInterfaceDecl>(ND);
       assert(OID && "clang_getCursorLine(): Missing interface decl");
-      return createCXString(OID->getSuperClass()->getIdentifier()
-                            ->getNameStart());
+      return CIndexer::createCXString(OID->getSuperClass()->getIdentifier()
+                                      ->getNameStart());
     }
     case CXCursor_ObjCClassRef: {
       if (ObjCInterfaceDecl *OID = dyn_cast<ObjCInterfaceDecl>(ND))
-        return createCXString(OID->getIdentifier()->getNameStart());
+        return CIndexer::createCXString(OID->getIdentifier()->getNameStart());
 
       ObjCCategoryDecl *OCD = dyn_cast<ObjCCategoryDecl>(ND);
       assert(OCD && "clang_getCursorLine(): Missing category decl");
-      return createCXString(OCD->getClassInterface()->getIdentifier()
+      return CIndexer::createCXString(OCD->getClassInterface()->getIdentifier()
                             ->getNameStart());
     }
     case CXCursor_ObjCProtocolRef: {
       ObjCProtocolDecl *OID = dyn_cast<ObjCProtocolDecl>(ND);
       assert(OID && "clang_getCursorLine(): Missing protocol decl");
-      return createCXString(OID->getIdentifier()->getNameStart());
+      return CIndexer::createCXString(OID->getIdentifier()->getNameStart());
     }
     case CXCursor_ObjCSelectorRef: {
       ObjCMessageExpr *OME = dyn_cast<ObjCMessageExpr>(
         static_cast<Stmt *>(C.stmt));
       assert(OME && "clang_getCursorLine(): Missing message expr");
-      return createCXString(OME->getSelector().getAsString().c_str(), true);
+      return CIndexer::createCXString(OME->getSelector().getAsString().c_str(),
+                                      true);
     }
     case CXCursor_VarRef:
     case CXCursor_FunctionRef:
@@ -788,10 +791,11 @@
       DeclRefExpr *DRE = dyn_cast<DeclRefExpr>(
         static_cast<Stmt *>(C.stmt));
       assert(DRE && "clang_getCursorLine(): Missing decl ref expr");
-      return createCXString(DRE->getDecl()->getIdentifier()->getNameStart());
+      return CIndexer::createCXString(DRE->getDecl()->getIdentifier()
+                                      ->getNameStart());
     }
     default:
-      return createCXString("<not implemented>");
+      return CIndexer::createCXString("<not implemented>");
     }
   }
   return clang_getDeclSpelling(C.decl);
@@ -1049,8 +1053,9 @@
   NamedDecl *ND = static_cast<NamedDecl *>(C.decl);
   SourceManager &SourceMgr = ND->getASTContext().getSourceManager();
 
-  return (void *)getFileEntryFromSourceLocation(SourceMgr,
-                                                getLocationFromCursor(C,SourceMgr, ND));
+  return (void *)
+    getFileEntryFromSourceLocation(SourceMgr, getLocationFromCursor(C,SourceMgr,
+                                                                    ND));
 }
 
 void clang_getDefinitionSpellingAndExtent(CXCursor C,

Modified: cfe/trunk/tools/CIndex/CIndexer.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/CIndex/CIndexer.h?rev=93212&r1=93211&r2=93212&view=diff

==============================================================================
--- cfe/trunk/tools/CIndex/CIndexer.h (original)
+++ cfe/trunk/tools/CIndex/CIndexer.h Mon Jan 11 18:36:38 2010
@@ -81,6 +81,8 @@
   
   /// \brief Get the path of the clang resource files.
   std::string getClangResourcesPath();
+
+  static CXString createCXString(const char *String, bool DupString = false);
 };
 
 #endif