From: Nick Lewycky Date: Fri, 16 Apr 2010 18:49:45 +0000 (+0000) Subject: Add a write(raw_ostream&) method to RewriteBuffer. This uses an inefficient X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0ade808e0ac411baa2dbc1f76ad352b9b6d6d3f8;p=clang Add a write(raw_ostream&) method to RewriteBuffer. This uses an inefficient implementation today but is the right place if we want to make it faster some day. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101521 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Rewrite/Rewriter.h b/include/clang/Rewrite/Rewriter.h index d99ca8bb1f..adda866999 100644 --- a/include/clang/Rewrite/Rewriter.h +++ b/include/clang/Rewrite/Rewriter.h @@ -16,13 +16,15 @@ #define LLVM_CLANG_REWRITER_H #include "clang/Basic/SourceLocation.h" +#include "clang/Rewrite/DeltaTree.h" #include "clang/Rewrite/RewriteRope.h" -#include -#include +#include "llvm/ADT/StringRef.h" #include +#include #include -#include "clang/Rewrite/DeltaTree.h" -#include "llvm/ADT/StringRef.h" +#include + +namespace llvm { class raw_ostream; } namespace clang { class LangOptions; @@ -53,6 +55,8 @@ public: iterator end() const { return Buffer.end(); } unsigned size() const { return Buffer.size(); } + llvm::raw_ostream &write(llvm::raw_ostream &) const; + /// RemoveText - Remove the specified text. void RemoveText(unsigned OrigOffset, unsigned Size); diff --git a/lib/Frontend/FixItRewriter.cpp b/lib/Frontend/FixItRewriter.cpp index b26401212f..7aff92340e 100644 --- a/lib/Frontend/FixItRewriter.cpp +++ b/lib/Frontend/FixItRewriter.cpp @@ -39,7 +39,7 @@ FixItRewriter::~FixItRewriter() { bool FixItRewriter::WriteFixedFile(FileID ID, llvm::raw_ostream &OS) { const RewriteBuffer *RewriteBuf = Rewrite.getRewriteBufferFor(ID); if (!RewriteBuf) return true; - OS << std::string(RewriteBuf->begin(), RewriteBuf->end()); + RewriteBuf->write(OS); OS.flush(); return false; } diff --git a/lib/Rewrite/Rewriter.cpp b/lib/Rewrite/Rewriter.cpp index bf8ba701a8..376678a5d7 100644 --- a/lib/Rewrite/Rewriter.cpp +++ b/lib/Rewrite/Rewriter.cpp @@ -20,6 +20,12 @@ #include "llvm/Support/raw_ostream.h" using namespace clang; +llvm::raw_ostream &RewriteBuffer::write(llvm::raw_ostream &os) const { + // FIXME: eliminate the copy by writing out each chunk at a time + os << std::string(begin(), end()); + return os; +} + void RewriteBuffer::RemoveText(unsigned OrigOffset, unsigned Size) { // Nothing to remove, exit early. if (Size == 0) return; @@ -222,5 +228,3 @@ bool Rewriter::ReplaceStmt(Stmt *From, Stmt *To) { ReplaceText(From->getLocStart(), Size, Str); return false; } - -