Replace BaseStream with auto-properties

***NO_CI***

Author: josesimoes

System.IO.Streams/StreamReader.cs

@@ -17,8 +17,6 @@ public class StreamReader : TextReader
         private const int c_MaxReadLineLen = 0xFFFF;
         private const int c_BufferSize = 512;
 
-        private Stream _stream;
-
         // Initialized in constructor by CurrentEncoding scheme.
         // Encoding can be changed by resetting this variable.
         readonly Decoder _decoder;
@@ -42,7 +40,7 @@ public class StreamReader : TextReader
         /// <remarks>
         /// You use this property to access the underlying stream. The StreamReader class buffers input from the underlying stream when you call one of the Read methods. If you manipulate the position of the underlying stream after reading data into the buffer, the position of the underlying stream might not match the position of the internal buffer. To reset the internal buffer, call the DiscardBufferedData method; however, this method slows performance and should be called only when absolutely necessary. The StreamReader constructors that have the detectEncodingFromByteOrderMarks parameter can change the encoding the first time you read from the StreamReader object.
         /// </remarks>
-        public virtual Stream BaseStream => _stream;
+        public virtual Stream BaseStream { get; private set; }
 
         /// <summary>
         /// Gets the current character encoding that the current <see cref="StreamReader"/> object is using.
@@ -84,7 +82,7 @@ public StreamReader(Stream stream)
             _buffer = new byte[c_BufferSize];
             _curBufPos = 0;
             _curBufLen = 0;
-            _stream = stream;
+            BaseStream = stream;
             _decoder = CurrentEncoding.GetDecoder();
             _disposed = false;
         }
@@ -112,14 +110,14 @@ public override void Close()
         /// </remarks>
         protected override void Dispose(bool disposing)
         {
-            if (_stream != null)
+            if (BaseStream != null)
             {
                 if (disposing)
                 {
-                    _stream.Close();
+                    BaseStream.Close();
                 }
 
-                _stream = null;
+                BaseStream = null;
                 _buffer = null;
                 _curBufPos = 0;
                 _curBufLen = 0;
@@ -160,16 +158,16 @@ public override int Peek()
                 try
                 {
                     // retry read until response timeout expires
-                    while (_stream.Length > 0 && totRead < _buffer.Length)
+                    while (BaseStream.Length > 0 && totRead < _buffer.Length)
                     {
                         int len = (int)(_buffer.Length - totRead);
 
-                        if (len > _stream.Length)
+                        if (len > BaseStream.Length)
                         {
-                            len = (int)_stream.Length;
+                            len = (int)BaseStream.Length;
                         }
 
-                        len = _stream.Read(_buffer, totRead, len);
+                        len = BaseStream.Read(_buffer, totRead, len);
 
                         if (len <= 0)
                         {
@@ -238,7 +236,7 @@ public override int Read()
                     int readCount = _buffer.Length;
 
                     // Put it to the maximum of available data and readCount
-                    readCount = readCount > (int)_stream.Length ? (int)_stream.Length : readCount;
+                    readCount = readCount > (int)BaseStream.Length ? (int)BaseStream.Length : readCount;
 
                     if (readCount == 0)
                     {
@@ -421,7 +419,7 @@ public override string ReadToEnd()
         {
             char[] result = null;
 
-            if (_stream.CanSeek)
+            if (BaseStream.CanSeek)
             {
                 result = ReadSeekableStream();
             }
@@ -435,7 +433,7 @@ public override string ReadToEnd()
 
         private char[] ReadSeekableStream()
         {
-            char[] chars = new char[(int)_stream.Length];
+            char[] chars = new char[(int)BaseStream.Length];
 
             _ = Read(chars, 0, chars.Length);
 
@@ -518,7 +516,7 @@ private int FillBufferAndReset(int count)
 
                     if (count > spaceLeft) count = spaceLeft;
 
-                    int read = _stream.Read(_buffer, _curBufLen, count);
+                    int read = BaseStream.Read(_buffer, _curBufLen, count);
 
                     if (read == 0) break;
 

System.IO.Streams/StreamWriter.cs

@@ -16,7 +16,6 @@ public class StreamWriter : TextWriter
         private const string c_NewLine = "\r\n";
         private const int c_BufferSize = 0xFFF;
 
-        private Stream _stream;
         private bool _disposed;
         private byte[] _buffer;
         private int _curBufPos;
@@ -25,7 +24,7 @@ public class StreamWriter : TextWriter
         /// Gets the underlying stream that interfaces with a backing store.
         /// </summary>
         /// <value>The stream this <see cref="StreamWriter"/> is writing to.</value>
-        public virtual Stream BaseStream => _stream;
+        public virtual Stream BaseStream { get; private set; }
 
         /// <summary>
         /// Gets the <see cref="Encoding"/> in which the output is written.
@@ -51,7 +50,7 @@ public StreamWriter(Stream stream)
                 throw new ArgumentException();
             }
 
-            _stream = stream;
+            BaseStream = stream;
             _buffer = new byte[c_BufferSize];
             _curBufPos = 0;
             _disposed = false;
@@ -80,13 +79,13 @@ public override void Close()
         /// </remarks>
         protected override void Dispose(bool disposing)
         {
-            if (_stream != null)
+            if (BaseStream != null)
             {
                 if (disposing)
                 {
                     try
                     {
-                        if (_stream.CanWrite)
+                        if (BaseStream.CanWrite)
                         {
                             Flush();
                         }
@@ -95,12 +94,12 @@ protected override void Dispose(bool disposing)
 
                     try
                     {
-                        _stream.Close();
+                        BaseStream.Close();
                     }
                     catch { }
                 }
 
-                _stream = null;
+                BaseStream = null;
                 _buffer = null;
                 _curBufPos = 0;
             }
@@ -128,7 +127,7 @@ public override void Flush()
             {
                 try
                 {
-                    _stream.Write(_buffer, 0, _curBufPos);
+                    BaseStream.Write(_buffer, 0, _curBufPos);
                 }
                 catch (Exception e)
                 {
@@ -197,10 +196,10 @@ internal void WriteBytes(
                 // directly to stream.
                 try
                 {
-                    _stream.Write(_buffer, 0, _curBufPos);
+                    BaseStream.Write(_buffer, 0, _curBufPos);
                     _curBufPos = 0;
 
-                    _stream.Write(buffer, index, count);
+                    BaseStream.Write(buffer, index, count);
 
                     return;
                 }