From ab810275448c34c072c47be1f16ae1d679bfd20c Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Tue, 18 Aug 2009 23:36:04 +0000 Subject: raw_ostream: Reduce FormattedStream's reliance on raw_ostream's implementation. - Kill off begin(), end(), and iterator. It isn't clear what these mean. Instead provide getBufferStart(), which can be used with GetNumBytesInBuffer to the same effect. - Update ComputeColumn to take arguments for the buffer to scan, this simplifies the implementation of write_impl substantially. - This should also fix possible problems with the scanning pointer pointing outside of the current raw_ostream buffer. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79379 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/FormattedStream.h | 12 ++++++------ include/llvm/Support/raw_ostream.h | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'include') diff --git a/include/llvm/Support/FormattedStream.h b/include/llvm/Support/FormattedStream.h index 6157c40de6..3a872058c9 100644 --- a/include/llvm/Support/FormattedStream.h +++ b/include/llvm/Support/FormattedStream.h @@ -58,7 +58,7 @@ namespace llvm /// Scanned - This points to one past the last character in the /// buffer we've scanned. /// - iterator Scanned; + const char *Scanned; virtual void write_impl(const char *Ptr, size_t Size); @@ -70,10 +70,10 @@ namespace llvm return TheStream->tell() - TheStream->GetNumBytesInBuffer(); } - /// ComputeColumn - Examine the current output and figure out - /// which column we end up in after output. + /// ComputeColumn - Examine the given output buffer and figure out which + /// column we end up in after output. /// - void ComputeColumn(); + void ComputeColumn(const char *Ptr, size_t size); public: /// formatted_raw_ostream - Open the specified file for @@ -92,7 +92,7 @@ namespace llvm } explicit formatted_raw_ostream() : raw_ostream(), TheStream(0), DeleteStream(false), ColumnScanned(0) { - Scanned = begin(); + Scanned = 0; } ~formatted_raw_ostream() { @@ -116,7 +116,7 @@ namespace llvm SetUnbuffered(); TheStream->SetUnbuffered(); - Scanned = begin(); + Scanned = 0; } /// PadToColumn - Align the output to some column number. If the current diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h index b1b96f2316..5e20deb166 100644 --- a/include/llvm/Support/raw_ostream.h +++ b/include/llvm/Support/raw_ostream.h @@ -251,9 +251,9 @@ protected: /// been encountered. void error_detected() { Error = true; } - typedef char * iterator; - iterator begin() { return OutBufStart; } - iterator end() { return OutBufCur; } + /// getBufferStart - Return the beginning of the current stream buffer, or 0 + /// if the stream is unbuffered. + const char *getBufferStart() const { return OutBufStart; } //===--------------------------------------------------------------------===// // Private Interface -- cgit v1.2.3