Some code refactoring per Dimitri's comment.

llvm-svn: 170478

clang/tools/libclang/CXComment.cpp

@@ -861,10 +861,10 @@ public:
                            SmallVectorImpl<char> &Str,
                            const CommandTraits &Traits,
                            const SourceManager &SM,
-                           SimpleFormatContext &RTC,
+                           SimpleFormatContext &SFC,
                            unsigned FUID) :
       FC(FC), Result(Str), Traits(Traits), SM(SM),
-      FormatRewriterContext(RTC),
+      FormatRewriterContext(SFC),
       FormatInMemoryUniqueId(FUID) { }
 
   // Inline content.
@@ -887,9 +887,8 @@ public:
   // Helpers.
   void appendToResultWithXMLEscaping(StringRef S);
       
-  unsigned getFormatInMemoryUniqueId() { return FormatInMemoryUniqueId; }
-  SimpleFormatContext &getFormatRewriterContext()
-    { return FormatRewriterContext; }
+  void formatTextOfDeclaration(const DeclInfo *DI,
+                               SmallString<128> &Declaration);
 
 private:
   const FullComment *FC;
@@ -915,15 +914,15 @@ void getSourceTextOfDeclaration(const DeclInfo *ThisDecl,
                                /*Indentation*/0, /*PrintInstantiation*/true);
 }
   
-void formatTextOfDeclaration(CommentASTToXMLConverter *C,
+void CommentASTToXMLConverter::formatTextOfDeclaration(
                                               const DeclInfo *DI,
                                               SmallString<128> &Declaration) {
   // FIXME. This conditional is TEMPORARY. We don't want to break multiple
   // large tests each time Format.cpp changes. This condition will
   // go away and formatting will happen for all declarations.
-  if (getenv("LIBCLANG_ACTIVATE_FORMAT")) {
-    SimpleFormatContext &FormatRewriterContext =
-      C->getFormatRewriterContext();
+  if (!getenv("LIBCLANG_ACTIVATE_FORMAT"))
+    return;
+  
   // FIXME. formatting API expects null terminated input string.
   // There might be more efficient way of doing this.
   std::string StringDecl = Declaration.str();
@@ -932,7 +931,7 @@ void formatTextOfDeclaration(CommentASTToXMLConverter *C,
   // Form a unique in memory buffer name.
   llvm::SmallString<128> filename;
   filename += "xmldecl";
-    filename += llvm::utostr(C->getFormatInMemoryUniqueId());
+  filename += llvm::utostr(FormatInMemoryUniqueId);
   filename += ".xd";
   FileID ID = FormatRewriterContext.createInMemoryFile(filename, StringDecl);
   SourceLocation Start =
@@ -950,7 +949,6 @@ void formatTextOfDeclaration(CommentASTToXMLConverter *C,
   applyAllReplacements(Replace, FormatRewriterContext.Rewrite);
   Declaration = FormatRewriterContext.getRewrittenText(ID);
 }
-}
 
 } // end unnamed namespace
 
@@ -1216,7 +1214,7 @@ void CommentASTToXMLConverter::visitFullComment(const FullComment *C) {
     Result << "<Declaration>";
     SmallString<128> Declaration;
     getSourceTextOfDeclaration(DI, Declaration);
-    formatTextOfDeclaration(this, DI, Declaration);
+    formatTextOfDeclaration(DI, Declaration);
     appendToResultWithXMLEscaping(Declaration);
     
     Result << "</Declaration>";
@@ -1382,8 +1380,9 @@ CXString clang_FullComment_getAsXML(CXComment CXC) {
   if (!SFC) {
     SFC = new SimpleFormatContext(Context.getLangOpts());
     TU->FormatContext = SFC;
-  }
-  else if ((TU->FormatInMemoryUniqueId % 10) == 0) {
+  } else if ((TU->FormatInMemoryUniqueId % 10) == 0) {
+    // Delete after some number of iterators, so the buffers don't grow
+    // too large.
     delete SFC;
     SFC = new SimpleFormatContext(Context.getLangOpts());
     TU->FormatContext = SFC;

clang/tools/libclang/SimpleFormatContext.h

@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-//  This file defines a utility class for Rewriter related tests.
+/// \file This file defines a utility class for use of clang-format in libclang
 //
 //===----------------------------------------------------------------------===//