2002-03-21 Mike Kestner <[email protected]>

	* ASCIIEncoding.cs : Fix off by one error in Get(Char|Byte)Count.

2002-03-21  Mike Kestner <[email protected]>

	* StreamReader.cs : Fill out, add buffering, and use encoding.

svn path=/trunk/mcs/; revision=3266

mcs/class/corlib/System.IO/ChangeLog

@@ -1,3 +1,7 @@
+2002-03-21  Mike Kestner <[email protected]>
+
+	* StreamReader.cs : Fill out, add buffering, and use encoding.
+
 2002-03-19  Martin Baulig  <[email protected]>
 
 	* StreamWriter.cs (StreamWriter (string)): The default is to override

mcs/class/corlib/System.IO/StreamReader.cs

@@ -7,7 +7,6 @@
 // (C) Ximian, Inc.  http://www.ximian.com
 //
 
-
 using System;
 using System.Text;
 
@@ -15,11 +14,16 @@ namespace System.IO {
 	
 	public class StreamReader : TextReader {
 
+		// buffering members
+		private char[] buffer;
+		private int pos;
+
 		private Encoding internalEncoding;
+		private Decoder decoder;
 
 		private Stream internalStream;
 
-                // new public static readonly StreamReader Null;
+                public new static readonly StreamReader Null = new StreamReader((Stream)null);
 
 		public StreamReader(Stream stream)
 			: this (stream, null, false, 0) { }
@@ -33,15 +37,21 @@ namespace System.IO {
 		public StreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks)
 			: this (stream, encoding, detectEncodingFromByteOrderMarks, 0) { }
 		
+		[MonoTODO]
 		public StreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize)
 		{
 			internalStream = stream;
 
-			if (encoding == null)
+			// use detect encoding flag
+			if (encoding == null) {
 				internalEncoding = Encoding.UTF8;
-			else
+				decoder = Encoding.UTF8.GetDecoder ();
+			} else {
 				internalEncoding = encoding;
+				decoder = encoding.GetDecoder ();
+ 			}
 
+			buffer = null;
 		}
 
 		public StreamReader(string path)
@@ -56,15 +66,21 @@ namespace System.IO {
 		public StreamReader(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks)
 			: this (path, encoding, detectEncodingFromByteOrderMarks, 0) { }
 		
+		[MonoTODO]
 		public StreamReader(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize)
 		{
-			//internalStream = stream;
-
-			if (encoding == null)
+			// use detect encoding flag
+			if (encoding == null) {
 				internalEncoding = Encoding.UTF8;
-			else
+				decoder = Encoding.UTF8.GetDecoder ();
+			} else {
 				internalEncoding = encoding;
+				decoder = encoding.GetDecoder ();
+ 			}
+
+			internalStream = (Stream) File.OpenRead (path);
 
+			buffer = null;
 		}
 
 		public virtual Stream BaseStream
@@ -82,30 +98,70 @@ namespace System.IO {
 		}
 
 		[MonoTODO]
+		public override void Close ()
+		{
+			Dispose (true);
+		}
+
+		[MonoTODO]
+		public void DiscardBufferedData ()
+		{
+		}
+
 		public override int Peek ()
 		{
-			// FIXME: handle encoding....
-			int val = internalStream.ReadByte ();
-			if (val != -1)
-				internalStream.Seek (-1, SeekOrigin.Current);
-			return val;
+			if (!internalStream.CanSeek)
+				return -1;
+
+			if ((buffer == null) || ((pos + 1) == buffer.Length)) {
+				int cnt = internalEncoding.GetMaxByteCount (1);
+				byte[] bytes = new byte[cnt];
+				int actcnt = internalStream.Read (bytes, 0, cnt);
+				internalStream.Seek (-actcnt, SeekOrigin.Current);
+
+				if (actcnt <= 0) 
+					return -1;
+
+				int bufcnt = decoder.GetCharCount (bytes, 0, cnt);
+				char[] chars = new char [bufcnt];
+				bufcnt = decoder.GetChars (bytes, 0, cnt, chars, 0);
+				return chars [0];
+			}
+
+			return buffer [pos + 1];
 		}
 
 		public override int Read ()
 		{
-			return internalStream.ReadByte ();
+			if ((buffer == null) || (++pos == buffer.Length)) {
+				byte[] bytes =  new byte [8192];
+				int cnt = internalStream.Read (bytes, 0, 8192);
+
+				if (cnt <= 0) 
+					return -1;
+
+				int bufcnt = decoder.GetCharCount (bytes, 0, cnt);
+				buffer = new char [bufcnt];
+				bufcnt = decoder.GetChars (bytes, 0, cnt, buffer, 0);
+				pos = 0;
+			}
+
+			return buffer[pos];
 		}
 
+		[MonoTODO]
 		public override int Read (char[] buffer, int index, int count)
 		{
 			return 0;
 		}
 
+		[MonoTODO]
 		public override string ReadLine()
 		{
 			return String.Empty;
 		}
 
+		[MonoTODO]
                 public override string ReadToEnd()
 		{
 			return String.Empty;

mcs/class/corlib/System.Text/ASCIIEncoding.cs

@@ -46,7 +46,7 @@ namespace System.Text {
 			if (chars == null) 
 				throw new ArgumentNullException ();
 
-			if ((index < 0) || (count <= 0) || ((index + count) >= chars.Length))
+			if ((index < 0) || (count <= 0) || ((index + count) > chars.Length))
 				throw new ArgumentOutOfRangeException ();
 
 			return count;
@@ -95,7 +95,7 @@ namespace System.Text {
 			if (bytes == null) 
 				throw new ArgumentNullException ();
 
-			if ((index < 0) || (count <= 0) || ((index + count) >= bytes.Length))
+			if ((index < 0) || (count <= 0) || ((index + count) > bytes.Length))
 				throw new ArgumentOutOfRangeException ();
 
 			return count;

mcs/class/corlib/System.Text/ChangeLog

@@ -1,3 +1,6 @@
+2002-03-21  Mike Kestner  <[email protected]>
+
+	* ASCIIEncoding.cs : Fix off by one error in Get(Char|Byte)Count.
 
 Thu Mar 21 17:38:19 CET 2002 Paolo Molaro <[email protected]>