Fix compilation of array initializer used inside field initializer of an anonymous...
[mono.git] / mcs / mcs / support.cs
index 6bf8f1cd0910c876651ae949468cf6a77a813796..55841d0cc254f1b8b0ac3af080d724666045966c 100644 (file)
@@ -13,9 +13,6 @@
 using System;
 using System.IO;
 using System.Text;
-using System.Reflection;
-using System.Reflection.Emit;
-using System.Globalization;
 using System.Collections.Generic;
 
 namespace Mono.CSharp {
@@ -66,12 +63,66 @@ namespace Mono.CSharp {
                #endregion
        }
 
+       public class Tuple<T1, T2, T3> : IEquatable<Tuple<T1, T2, T3>>
+       {
+               public Tuple (T1 item1, T2 item2, T3 item3)
+               {
+                       Item1 = item1;
+                       Item2 = item2;
+                       Item3 = item3;
+               }
+
+               public T1 Item1 { get; private set; }
+               public T2 Item2 { get; private set; }
+               public T3 Item3 { get; private set; }
+
+               public override int GetHashCode ()
+               {
+                       return Item1.GetHashCode () ^ Item2.GetHashCode () ^ Item3.GetHashCode ();
+               }
+
+               #region IEquatable<Tuple<T1,T2>> Members
+
+               public bool Equals (Tuple<T1, T2, T3> other)
+               {
+                       return EqualityComparer<T1>.Default.Equals (Item1, other.Item1) &&
+                               EqualityComparer<T2>.Default.Equals (Item2, other.Item2) &&
+                               EqualityComparer<T3>.Default.Equals (Item3, other.Item3);
+               }
+
+               #endregion
+       }
+
        static class Tuple
        {
                public static Tuple<T1, T2> Create<T1, T2> (T1 item1, T2 item2)
                {
                        return new Tuple<T1, T2> (item1, item2);
                }
+
+               public static Tuple<T1, T2, T3> Create<T1, T2, T3> (T1 item1, T2 item2, T3 item3)
+               {
+                       return new Tuple<T1, T2, T3> (item1, item2, item3);
+               }
+       }
+
+       static class ArrayComparer
+       {
+               public static bool IsEqual<T> (T[] array1, T[] array2)
+               {
+                       if (array1 == null || array2 == null)
+                               return array1 == array2;
+
+                       var eq = EqualityComparer<T>.Default;
+
+                       for (int i = 0; i < array1.Length; ++i) {
+                               if (!eq.Equals (array1[i], array2[i])) {
+                                       return false;
+                               }
+                       }
+
+                       return true;
+               }
        }
 
        /// <summary>
@@ -83,23 +134,21 @@ namespace Mono.CSharp {
        /// </summary>
        public class SeekableStreamReader : IDisposable
        {
-               const int buffer_read_length_spans = 3;
-
-               TextReader reader;
+               StreamReader reader;
                Stream stream;
 
                static char[] buffer;
-               int average_read_length;
+               int read_ahead_length;  // the length of read buffer
                int buffer_start;       // in chars
-               int char_count;         // count buffer[] valid characters
+               int char_count;         // count of filled characters in buffer[]
                int pos;                // index into buffer[]
 
                public SeekableStreamReader (Stream stream, Encoding encoding)
                {
                        this.stream = stream;
 
-                       const int default_average_read_length = 1024;
-                       InitializeStream (default_average_read_length);
+                       const int default_read_ahead = 2048;
+                       InitializeStream (default_read_ahead);
                        reader = new StreamReader (stream, encoding, true);
                }
 
@@ -111,13 +160,14 @@ namespace Mono.CSharp {
 
                void InitializeStream (int read_length_inc)
                {
-                       average_read_length += read_length_inc;
+                       read_ahead_length += read_length_inc;
+
+                       int required_buffer_size = read_ahead_length * 2;
 
-                       int required_buffer_size = average_read_length * buffer_read_length_spans;
                        if (buffer == null || buffer.Length < required_buffer_size)
                                buffer = new char [required_buffer_size];
 
-                       stream.Position = 0;                    
+                       stream.Position = 0;
                        buffer_start = char_count = pos = 0;
                }
 
@@ -129,12 +179,25 @@ namespace Mono.CSharp {
                ///   a correlation between them.
                /// </remarks>
                public int Position {
-                       get { return buffer_start + pos; }
+                       get {
+                               return buffer_start + pos;
+                       }
 
                        set {
-                               // If the lookahead was too small, re-read from the beginning.  Increase the buffer size while we're at it
-                               if (value < buffer_start)
-                                       InitializeStream (average_read_length / 2);
+                               //
+                               // If the lookahead was too small, re-read from the beginning. Increase the buffer size while we're at it
+                               // This should never happen until we are parsing some weird source code
+                               //
+                               if (value < buffer_start) {
+                                       InitializeStream (read_ahead_length);
+
+                                       //
+                                       // Discard buffer data after underlying stream changed position
+                                       // Cannot use handy reader.DiscardBufferedData () because it for
+                                       // some strange reason resets encoding as well
+                                       //
+                                       reader = new StreamReader (stream, reader.CurrentEncoding, true);
+                               }
 
                                while (value > buffer_start + char_count) {
                                        pos = char_count;
@@ -146,17 +209,26 @@ namespace Mono.CSharp {
                        }
                }
 
-               private bool ReadBuffer ()
+               bool ReadBuffer ()
                {
                        int slack = buffer.Length - char_count;
-                       if (slack <= average_read_length / 2) {
-                               // shift the buffer to make room for average_read_length number of characters
-                               int shift = average_read_length - slack;
+
+                       //
+                       // read_ahead_length is only half of the buffer to deal with
+                       // reads ahead and moves back without re-reading whole buffer
+                       //
+                       if (slack <= read_ahead_length) {
+                               //
+                               // shift the buffer to make room for read_ahead_length number of characters
+                               //
+                               int shift = read_ahead_length - slack;
                                Array.Copy (buffer, shift, buffer, 0, char_count - shift);
+
+                               // Update all counters
                                pos -= shift;
                                char_count -= shift;
                                buffer_start += shift;
-                               slack += shift;         // slack == average_read_length
+                               slack += shift;
                        }
 
                        char_count += reader.Read (buffer, char_count, slack);
@@ -164,6 +236,18 @@ namespace Mono.CSharp {
                        return pos < char_count;
                }
 
+               public char[] ReadChars (int fromPosition, int toPosition)
+               {
+                       char[] chars = new char[toPosition - fromPosition];
+                       if (buffer_start <= fromPosition && toPosition <= buffer_start + buffer.Length) {
+                               Array.Copy (buffer, fromPosition - buffer_start, chars, 0, chars.Length);
+                       } else {
+                               throw new NotImplementedException ();
+                       }
+
+                       return chars;
+               }
+
                public int Peek ()
                {
                        if ((pos >= char_count) && !ReadBuffer ())