maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Comment to XML conversion: use unique_ptr for SimpleFormatContext 

llvm-svn: 207087
This commit is contained in:
Dmitri Gribenko 2014-04-24 07:52:31 +00:00
parent 944b9acddd
commit 4f4dd17d05
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/include/clang/Index/CommentToXML.h
View File

@ -11,6 +11,7 @@
#define LLVM_CLANG_INDEX_COMMENTTOXML_H
#include "clang/Basic/LLVM.h"
#include <memory>
namespace clang {
class ASTContext;
@ -24,11 +25,11 @@ namespace index {
class SimpleFormatContext;
class CommentToXMLConverter {
SimpleFormatContext *FormatContext;
std::unique_ptr<SimpleFormatContext> FormatContext;
unsigned FormatInMemoryUniqueId;
public:
CommentToXMLConverter() : FormatContext(0), FormatInMemoryUniqueId(0) {}
CommentToXMLConverter();
~CommentToXMLConverter();
void convertCommentToHTML(const comments::FullComment *FC,

16
clang/lib/Index/CommentToXML.cpp
View File

@ -1136,9 +1136,8 @@ void CommentASTToXMLConverter::appendToResultWithCDATAEscaping(StringRef S) {
Result << "]]>";
}
CommentToXMLConverter::~CommentToXMLConverter() {
delete FormatContext;
}
CommentToXMLConverter::CommentToXMLConverter() : FormatInMemoryUniqueId(0) {}
CommentToXMLConverter::~CommentToXMLConverter() = default;
void CommentToXMLConverter::convertCommentToHTML(const FullComment *FC,
SmallVectorImpl<char> &HTML,
@ -1159,13 +1158,10 @@ void CommentToXMLConverter::convertHTMLTagNodeToText(
void CommentToXMLConverter::convertCommentToXML(const FullComment *FC,
SmallVectorImpl<char> &XML,
const ASTContext &Context) {
if (!FormatContext) {
FormatContext = new SimpleFormatContext(Context.getLangOpts());
} else if ((FormatInMemoryUniqueId % 1000) == 0) {
// Delete after some number of iterations, so the buffers don't grow
// too large.
delete FormatContext;
FormatContext = new SimpleFormatContext(Context.getLangOpts());
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(),