r286279 - Remove FormatContext from libClang as it is now unused.
Daniel Jasper via cfe-commits
cfe-commits at lists.llvm.org
Tue Nov 8 11:47:19 PST 2016
Author: djasper
Date: Tue Nov 8 13:47:19 2016
New Revision: 286279
URL: http://llvm.org/viewvc/llvm-project?rev=286279&view=rev
Log:
Remove FormatContext from libClang as it is now unused.
Modified:
cfe/trunk/include/clang/Index/CommentToXML.h
cfe/trunk/lib/Index/CommentToXML.cpp
Modified: cfe/trunk/include/clang/Index/CommentToXML.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Index/CommentToXML.h?rev=286279&r1=286278&r2=286279&view=diff
==============================================================================
--- cfe/trunk/include/clang/Index/CommentToXML.h (original)
+++ cfe/trunk/include/clang/Index/CommentToXML.h Tue Nov 8 13:47:19 2016
@@ -22,12 +22,7 @@ class HTMLTagComment;
}
namespace index {
-class SimpleFormatContext;
-
class CommentToXMLConverter {
- std::unique_ptr<SimpleFormatContext> FormatContext;
- unsigned FormatInMemoryUniqueId;
-
public:
CommentToXMLConverter();
~CommentToXMLConverter();
Modified: cfe/trunk/lib/Index/CommentToXML.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Index/CommentToXML.cpp?rev=286279&r1=286278&r2=286279&view=diff
==============================================================================
--- cfe/trunk/lib/Index/CommentToXML.cpp (original)
+++ cfe/trunk/lib/Index/CommentToXML.cpp Tue Nov 8 13:47:19 2016
@@ -8,7 +8,6 @@
//===----------------------------------------------------------------------===//
#include "clang/Index/CommentToXML.h"
-#include "SimpleFormatContext.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Attr.h"
#include "clang/AST/Comment.h"
@@ -531,12 +530,8 @@ public:
CommentASTToXMLConverter(const FullComment *FC,
SmallVectorImpl<char> &Str,
const CommandTraits &Traits,
- const SourceManager &SM,
- SimpleFormatContext &SFC,
- unsigned FUID) :
- FC(FC), Result(Str), Traits(Traits), SM(SM),
- FormatRewriterContext(SFC),
- FormatInMemoryUniqueId(FUID) { }
+ const SourceManager &SM) :
+ FC(FC), Result(Str), Traits(Traits), SM(SM) { }
// Inline content.
void visitTextComment(const TextComment *C);
@@ -574,8 +569,6 @@ private:
const CommandTraits &Traits;
const SourceManager &SM;
- SimpleFormatContext &FormatRewriterContext;
- unsigned FormatInMemoryUniqueId;
};
void getSourceTextOfDeclaration(const DeclInfo *ThisDecl,
@@ -596,18 +589,13 @@ void CommentASTToXMLConverter::formatTex
StringRef StringDecl(Declaration.c_str(), Declaration.size());
// Formatter specific code.
- // Form a unique in memory buffer name.
- SmallString<128> Filename;
- Filename += "xmldecl";
- Filename += llvm::utostr(FormatInMemoryUniqueId);
- Filename += ".xd";
unsigned Offset = 0;
unsigned Length = Declaration.size();
bool IncompleteFormat = false;
tooling::Replacements Replaces =
reformat(format::getLLVMStyle(), StringDecl,
- tooling::Range(Offset, Length), Filename, &IncompleteFormat);
+ tooling::Range(Offset, Length), "xmldecl.xd", &IncompleteFormat);
auto FormattedStringDecl = applyAllReplacements(StringDecl, Replaces);
if (static_cast<bool>(FormattedStringDecl)) {
Declaration = *FormattedStringDecl;
@@ -1127,7 +1115,7 @@ void CommentASTToXMLConverter::appendToR
Result << "]]>";
}
-CommentToXMLConverter::CommentToXMLConverter() : FormatInMemoryUniqueId(0) {}
+CommentToXMLConverter::CommentToXMLConverter() {}
CommentToXMLConverter::~CommentToXMLConverter() {}
void CommentToXMLConverter::convertCommentToHTML(const FullComment *FC,
@@ -1149,14 +1137,7 @@ void CommentToXMLConverter::convertHTMLT
void CommentToXMLConverter::convertCommentToXML(const FullComment *FC,
SmallVectorImpl<char> &XML,
const ASTContext &Context) {
- if (!FormatContext || (FormatInMemoryUniqueId % 1000) == 0) {
- // Create a new format context, or re-create it after some number of
- // iterations, so the buffers don't grow too large.
- FormatContext.reset(new SimpleFormatContext(Context.getLangOpts()));
- }
-
CommentASTToXMLConverter Converter(FC, XML, Context.getCommentCommandTraits(),
- Context.getSourceManager(), *FormatContext,
- FormatInMemoryUniqueId++);
+ Context.getSourceManager());
Converter.visit(FC);
}
More information about the cfe-commits
mailing list