[mono-api-html] Print string fields with no (or null) value without an NRE.

[mono.git] / mcs / mcs / support.cs

diff --git a/mcs/mcs/support.cs b/mcs/mcs/support.cs
index 081ea60c3edf4a1b05fe59c6e988c5f6a9a3a400..be2f6a48583cfee7c23627d640ad7d46d0f22024 100644 (file)
--- a/mcs/mcs/support.cs
+++ b/mcs/mcs/support.cs
@@ -8,6 +8,7 @@
 //
 // Copyright 2001 Ximian, Inc (http://www.ximian.com)
 // Copyright 2003-2009 Novell, Inc
+// Copyright 2011 Xamarin Inc
 //
 
 using System;
@@ -35,7 +36,7 @@ namespace Mono.CSharp {
                        return System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode (obj);
                }
        }
-
+#if !NET_4_0 && !MOBILE_DYNAMIC
        public class Tuple<T1, T2> : IEquatable<Tuple<T1, T2>>
        {
                public Tuple (T1 item1, T2 item2)
@@ -105,6 +106,7 @@ namespace Mono.CSharp {
                        return new Tuple<T1, T2, T3> (item1, item2, item3);
                }
        }
+#endif
 
        static class ArrayComparer
        {
@@ -134,21 +136,28 @@ namespace Mono.CSharp {
        /// </summary>
        public class SeekableStreamReader : IDisposable
        {
+               public const int DefaultReadAheadSize =
+#if FULL_AST
+                       65536 / 2; // Large buffer because of ReadChars of large literal string
+#else
+                       4096 / 2;
+#endif
+
                StreamReader reader;
                Stream stream;
 
-               static char[] buffer;
+               char[] buffer;
                int read_ahead_length;  // the length of read buffer
                int buffer_start;       // in chars
                int char_count;         // count of filled characters in buffer[]
                int pos;                // index into buffer[]
 
-               public SeekableStreamReader (Stream stream, Encoding encoding)
+               public SeekableStreamReader (Stream stream, Encoding encoding, char[] sharedBuffer = null)
                {
                        this.stream = stream;
+                       this.buffer = sharedBuffer;
 
-                       const int default_read_ahead = 2048;
-                       InitializeStream (default_read_ahead);
+                       InitializeStream (DefaultReadAheadSize);
                        reader = new StreamReader (stream, encoding, true);
                }
 
@@ -239,8 +248,8 @@ namespace Mono.CSharp {
                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, chars, 0, chars.Length);
+                       if (buffer_start <= fromPosition && toPosition <= buffer_start + buffer.Length) {
+                               Array.Copy (buffer, fromPosition - buffer_start, chars, 0, chars.Length);
                        } else {
                                throw new NotImplementedException ();
                        }
@@ -313,4 +322,38 @@ namespace Mono.CSharp {
                        }
                }
        }
+
+       struct TypeNameParser
+       {
+               internal static string Escape(string name)
+               {
+                       if (name == null) {
+                               return null;
+                       }
+                       StringBuilder sb = null;
+                       for (int pos = 0; pos < name.Length; pos++) {
+                               char c = name[pos];
+                               switch (c) {
+                                       case '\\':
+                                       case '+':
+                                       case ',':
+                                       case '[':
+                                       case ']':
+                                       case '*':
+                                       case '&':
+                                               if (sb == null) {
+                                                       sb = new StringBuilder(name, 0, pos, name.Length + 3);
+                                               }
+                                               sb.Append("\\").Append(c);
+                                               break;
+                                       default:
+                                               if (sb != null) {
+                                                       sb.Append(c);
+                                               }
+                                               break;
+                               }
+                       }
+                       return sb != null ? sb.ToString() : name;
+               }
+       }
 }