X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fmcs%2Fsupport.cs;h=8fcb5bf6081b058042eb984fdb684167c9412570;hb=b7dc3a9663532553ea61bcaee3b41bc808617829;hp=a9e33b178bf7a976a87c88e6fa538b609e068ac4;hpb=286afd095ba609a91a5fd0257666219eb086008c;p=mono.git diff --git a/mcs/mcs/support.cs b/mcs/mcs/support.cs index a9e33b178bf..8fcb5bf6081 100644 --- a/mcs/mcs/support.cs +++ b/mcs/mcs/support.cs @@ -4,187 +4,73 @@ // // Author: // Miguel de Icaza (miguel@ximian.com) +// Marek Safar (marek.safar@gmail.com) // // Copyright 2001 Ximian, Inc (http://www.ximian.com) -// Copyright 2003-2008 Novell, Inc +// Copyright 2003-2009 Novell, Inc // using System; using System.IO; using System.Text; using System.Reflection; -using System.Collections; using System.Reflection.Emit; using System.Globalization; +using System.Collections.Generic; namespace Mono.CSharp { -#if GMCS_SOURCE - public class ReflectionConstraints : GenericConstraints + sealed class ReferenceEquality : IEqualityComparer where T : class { - GenericParameterAttributes attrs; - Type base_type; - Type class_constraint; - Type[] iface_constraints; - string name; + public static readonly IEqualityComparer Default = new ReferenceEquality (); - public static GenericConstraints GetConstraints (Type t) + private ReferenceEquality () { - Type [] constraints = t.GetGenericParameterConstraints (); - GenericParameterAttributes attrs = t.GenericParameterAttributes; - if (constraints.Length == 0 && attrs == GenericParameterAttributes.None) - return null; - return new ReflectionConstraints (t.Name, constraints, attrs); } - private ReflectionConstraints (string name, Type [] constraints, GenericParameterAttributes attrs) + public bool Equals (T x, T y) { - this.name = name; - this.attrs = attrs; - - if ((constraints.Length > 0) && !constraints [0].IsInterface) { - class_constraint = constraints [0]; - iface_constraints = new Type [constraints.Length - 1]; - Array.Copy (constraints, 1, iface_constraints, 0, constraints.Length - 1); - } else - iface_constraints = constraints; - - if (HasValueTypeConstraint) - base_type = TypeManager.value_type; - else if (class_constraint != null) - base_type = class_constraint; - else - base_type = TypeManager.object_type; + return ReferenceEquals (x, y); } - public override string TypeParameter { - get { return name; } - } - - public override GenericParameterAttributes Attributes { - get { return attrs; } - } - - public override Type ClassConstraint { - get { return class_constraint; } - } - - public override Type EffectiveBaseClass { - get { return base_type; } - } - - public override Type[] InterfaceConstraints { - get { return iface_constraints; } + public int GetHashCode (T obj) + { + return System.Runtime.CompilerServices.RuntimeHelpers.GetHashCode (obj); } } -#endif - class PtrHashtable : Hashtable { - sealed class PtrComparer : IComparer -#if NET_2_0 - , IEqualityComparer -#endif + class Tuple : IEquatable> + { + public Tuple (T1 item1, T2 item2) { - private PtrComparer () {} - - public static PtrComparer Instance = new PtrComparer (); - - public int Compare (object x, object y) - { - if (x == y) - return 0; - else - return 1; - } -#if NET_2_0 - bool IEqualityComparer.Equals (object x, object y) - { - return x == y; - } - - int IEqualityComparer.GetHashCode (object obj) - { - return obj.GetHashCode (); - } -#endif - + Item1 = item1; + Item2 = item2; } -#if NET_2_0 - public PtrHashtable () : base (PtrComparer.Instance) {} -#else - public PtrHashtable () - { - comparer = PtrComparer.Instance; - } -#endif + public T1 Item1 { get; private set; } + public T2 Item2 { get; private set; } -#if MS_COMPATIBLE - // - // Workaround System.InvalidOperationException for enums - // - protected override int GetHash (object key) + public override int GetHashCode () { - TypeBuilder tb = key as TypeBuilder; - if (tb != null && tb.BaseType == TypeManager.enum_type) - key = tb.BaseType; - - return base.GetHash (key); - } -#endif - } - - /* - * Hashtable whose keys are character arrays with the same length - */ - class CharArrayHashtable : Hashtable { - sealed class ArrComparer : IComparer { - private int len; - - public ArrComparer (int len) { - this.len = len; - } - - public int Compare (object x, object y) - { - char[] a = (char[])x; - char[] b = (char[])y; - - for (int i = 0; i < len; ++i) - if (a [i] != b [i]) - return 1; - return 0; - } + return Item1.GetHashCode () ^ Item2.GetHashCode (); } - private int len; + #region IEquatable> Members - protected override int GetHash (Object key) + public bool Equals (Tuple other) { - char[] arr = (char[])key; - int h = 0; - - for (int i = 0; i < len; ++i) - h = (h << 5) - h + arr [i]; - - return h; + return EqualityComparer.Default.Equals (Item1, other.Item1) && + EqualityComparer.Default.Equals (Item2, other.Item2); } - public CharArrayHashtable (int len) - { - this.len = len; - comparer = new ArrComparer (len); - } + #endregion } - struct Pair { - public object First; - public object Second; - - public Pair (object f, object s) + static class Tuple + { + public static Tuple Create (T1 item1, T2 item2) { - First = f; - Second = s; + return new Tuple (item1, item2); } } @@ -209,36 +95,44 @@ namespace Mono.CSharp { /// but if the seek is too far, it may read the underly /// stream all over from the beginning. /// - public class SeekableStreamReader + public class SeekableStreamReader : IDisposable { - const int default_average_read_length = 1024; const int buffer_read_length_spans = 3; TextReader reader; Stream stream; - Encoding encoding; - char[] buffer; + static char[] buffer; int average_read_length; int buffer_start; // in chars int char_count; // count buffer[] valid characters int pos; // index into buffer[] - void ResetStream (int read_length_inc) + public SeekableStreamReader (Stream stream, Encoding encoding) { - average_read_length += read_length_inc; - stream.Position = 0; + this.stream = stream; + + const int default_average_read_length = 1024; + InitializeStream (default_average_read_length); reader = new StreamReader (stream, encoding, true); - buffer = new char [average_read_length * buffer_read_length_spans]; - buffer_start = char_count = pos = 0; } - public SeekableStreamReader (Stream stream, Encoding encoding) + public void Dispose () { - this.stream = stream; - this.encoding = encoding; + // Needed to release stream reader buffers + reader.Dispose (); + } + + void InitializeStream (int read_length_inc) + { + average_read_length += read_length_inc; - ResetStream (default_average_read_length); + 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; + buffer_start = char_count = pos = 0; } /// @@ -254,7 +148,7 @@ namespace Mono.CSharp { 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) - ResetStream (average_read_length / 2); + InitializeStream (average_read_length / 2); while (value > buffer_start + char_count) { pos = char_count; @@ -383,90 +277,6 @@ namespace Mono.CSharp { } } - class PartialMethodDefinitionInfo : MethodInfo - { - MethodOrOperator mc; - MethodAttributes attrs; - - public PartialMethodDefinitionInfo (MethodOrOperator mc) - { - this.mc = mc; - if ((mc.ModFlags & Modifiers.STATIC) != 0) - attrs = MethodAttributes.Static; - } - - public override MethodInfo GetBaseDefinition () - { - throw new NotImplementedException (); - } - - public override ICustomAttributeProvider ReturnTypeCustomAttributes - { - get { throw new NotImplementedException (); } - } - - public override MethodAttributes Attributes - { - get { return attrs; } - } - - public override MethodImplAttributes GetMethodImplementationFlags () - { - throw new NotImplementedException (); - } - - public override ParameterInfo [] GetParameters () - { - throw new NotImplementedException (); - } - - public override object Invoke (object obj, BindingFlags invokeAttr, Binder binder, object [] parameters, CultureInfo culture) - { - throw new NotImplementedException (); - } - - public override RuntimeMethodHandle MethodHandle - { - get { throw new NotImplementedException (); } - } - - public override Type DeclaringType - { - get { return mc.Parent.TypeBuilder; } - } - - public override object [] GetCustomAttributes (Type attributeType, bool inherit) - { - throw new NotImplementedException (); - } - - public override object [] GetCustomAttributes (bool inherit) - { - throw new NotImplementedException (); - } - - public override Type ReturnType { - get { - return mc.MemberType; - } - } - - public override bool IsDefined (Type attributeType, bool inherit) - { - throw new NotImplementedException (); - } - - public override string Name - { - get { return mc.Name; } - } - - public override Type ReflectedType - { - get { throw new NotImplementedException (); } - } - } - public class UnixUtils { [System.Runtime.InteropServices.DllImport ("libc", EntryPoint="isatty")] extern static int _isatty (int fd); @@ -480,4 +290,39 @@ namespace Mono.CSharp { } } } + + /// + /// An exception used to terminate the compiler resolution phase and provide completions + /// + /// + /// This is thrown when we want to return the completions or + /// terminate the completion process by AST nodes used in + /// the completion process. + /// + public class CompletionResult : Exception { + string [] result; + string base_text; + + public CompletionResult (string base_text, string [] res) + { + if (base_text == null) + throw new ArgumentNullException ("base_text"); + this.base_text = base_text; + + result = res; + Array.Sort (result); + } + + public string [] Result { + get { + return result; + } + } + + public string BaseText { + get { + return base_text; + } + } + } }