Author: martin
Date: 2005-04-28 07:37:01 -0400 (Thu, 28 Apr 2005)
New Revision: 43713
Modified:
trunk/mcs/class/corlib/System.Collections.Generic/ChangeLog
trunk/mcs/class/corlib/System.Collections.Generic/Comparer.cs
trunk/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
trunk/mcs/class/corlib/System.Collections.Generic/List.cs
trunk/mcs/class/corlib/System.Collections.Generic/Queue.cs
trunk/mcs/class/corlib/System.Collections.Generic/Stack.cs
Log:
2005-04-28 Martin Baulig <[EMAIL PROTECTED]>
* Dictionary.cs, Queue.cs, Stack.cs, List.cs, Comparer.cs: Don't
duplicate type parameters in the nested classes.
Modified: trunk/mcs/class/corlib/System.Collections.Generic/ChangeLog
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/ChangeLog 2005-04-28
11:19:19 UTC (rev 43712)
+++ trunk/mcs/class/corlib/System.Collections.Generic/ChangeLog 2005-04-28
11:37:01 UTC (rev 43713)
@@ -1,3 +1,8 @@
+2005-04-28 Martin Baulig <[EMAIL PROTECTED]>
+
+ * Dictionary.cs, Queue.cs, Stack.cs, List.cs, Comparer.cs: Don't
+ duplicate type parameters in the nested classes.
+
2005-04-20 Zoltan Varga <[EMAIL PROTECTED]>
* List.cs: Fix ToArray () method. Fixes #74675.
Modified: trunk/mcs/class/corlib/System.Collections.Generic/Comparer.cs
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/Comparer.cs
2005-04-28 11:19:19 UTC (rev 43712)
+++ trunk/mcs/class/corlib/System.Collections.Generic/Comparer.cs
2005-04-28 11:37:01 UTC (rev 43713)
@@ -48,14 +48,14 @@
return obj.GetHashCode ();
}
- static DefaultComparer <T> _default;
+ static DefaultComparer _default;
[MonoTODO ("This is going to make a really slow comparer. We
need to speed this up if T : ICompareable<T> create a class with a where clause
of T : ICompareable <T>")]
public static Comparer<T> Default {
get {
if (_default != null)
return _default;
- return _default = new DefaultComparer<T> ();
+ return _default = new DefaultComparer ();
}
}
@@ -97,7 +97,7 @@
throw new ArgumentException ();
}
- class DefaultComparer<T> : Comparer<T> {
+ class DefaultComparer : Comparer<T> {
public override int Compare (T x, T y)
{
Modified: trunk/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
2005-04-28 11:19:19 UTC (rev 43712)
+++ trunk/mcs/class/corlib/System.Collections.Generic/Dictionary.cs
2005-04-28 11:37:01 UTC (rev 43713)
@@ -370,11 +370,11 @@
}
ICollection<K> IDictionary<K, V>.Keys {
- get { return new HashKeyCollection<K> (this); }
+ get { return new HashKeyCollection (this); }
}
ICollection<V> IDictionary<K, V>.Values {
- get { return new HashValueCollection<V> (this); }
+ get { return new HashValueCollection (this); }
}
bool IDictionary.IsFixedSize {
@@ -460,12 +460,12 @@
IEnumerator IEnumerable.GetEnumerator ()
{
- return new Enumerator<K, V> (this,
EnumerationMode.DictionaryEntry);
+ return new Enumerator (this,
EnumerationMode.DictionaryEntry);
}
IEnumerator<KeyValuePair<K, V>> IEnumerable<KeyValuePair<K,
V>>.GetEnumerator ()
{
- return new Enumerator<K, V> (this);
+ return new Enumerator (this);
}
/**
@@ -479,18 +479,18 @@
IDictionaryEnumerator IDictionary.GetEnumerator ()
{
- return new Enumerator<K, V> (this,
EnumerationMode.DictionaryEntry);
+ return new Enumerator (this,
EnumerationMode.DictionaryEntry);
}
- public Enumerator<K, V> GetEnumerator ()
+ public Enumerator GetEnumerator ()
{
- return new Enumerator<K, V> (this,
EnumerationMode.KeyValuePair);
+ return new Enumerator (this,
EnumerationMode.KeyValuePair);
}
public enum EnumerationMode { Key, Value, DictionaryEntry,
KeyValuePair };
[Serializable]
- public struct Enumerator<K, V> : IEnumerator<KeyValuePair<K,
V>>,
+ public struct Enumerator : IEnumerator<KeyValuePair<K,V>>,
IDisposable, IDictionaryEnumerator, IEnumerator
{
Dictionary<K, V> _dictionary;
@@ -605,7 +605,7 @@
}
// This collection is a read only collection
- internal class HashKeyCollection<K> : ICollection<K>,
IEnumerable<K>, ICollection {
+ internal class HashKeyCollection : ICollection<K>,
IEnumerable<K>, ICollection {
Dictionary<K, V> _dictionary;
public HashKeyCollection (Dictionary<K, V> dictionary)
@@ -655,19 +655,19 @@
}
}
- public Enumerator<K, V> GetEnumerator ()
+ public Enumerator GetEnumerator ()
{
- return new Enumerator<K, V> (_dictionary);
+ return new Enumerator (_dictionary);
}
IEnumerator<K> IEnumerable<K>.GetEnumerator ()
{
- return new KeyEnumerator<K, V> (_dictionary);
+ return new KeyEnumerator (_dictionary);
}
IEnumerator IEnumerable.GetEnumerator ()
{
- return new Enumerator<K, V> (_dictionary,
EnumerationMode.Key);
+ return new Enumerator (_dictionary,
EnumerationMode.Key);
}
@@ -676,11 +676,11 @@
bool ICollection.IsSynchronized { get { return
((IDictionary) _dictionary).IsSynchronized; } }
object ICollection.SyncRoot { get { return
((IDictionary) _dictionary).SyncRoot; } }
- public struct KeyEnumerator<K, V> : IEnumerator<K>,
IDisposable, IEnumerator {
+ public struct KeyEnumerator : IEnumerator<K>,
IDisposable, IEnumerator {
IEnumerator _hostEnumerator;
internal KeyEnumerator (Dictionary<K, V>
dictionary)
{
- _hostEnumerator = new Enumerator<K, V>
(dictionary, EnumerationMode.Key);
+ _hostEnumerator = new Enumerator
(dictionary, EnumerationMode.Key);
}
public void Dispose ()
@@ -712,7 +712,7 @@
}
// This collection is a read only collection
- internal class HashValueCollection<V> : ICollection<V>,
IEnumerable<V>, ICollection {
+ internal class HashValueCollection : ICollection<V>,
IEnumerable<V>, ICollection {
Dictionary<K, V> _dictionary;
public HashValueCollection (Dictionary<K, V> dictionary)
@@ -762,19 +762,19 @@
}
}
- public Enumerator<K, V> GetEnumerator ()
+ public Enumerator GetEnumerator ()
{
- return new Enumerator<K, V> (_dictionary);
+ return new Enumerator (_dictionary);
}
IEnumerator<V> IEnumerable<V>.GetEnumerator ()
{
- return new ValueEnumerator<K, V> (_dictionary);
+ return new ValueEnumerator (_dictionary);
}
IEnumerator IEnumerable.GetEnumerator ()
{
- return new Enumerator<K, V> (_dictionary,
EnumerationMode.Value);
+ return new Enumerator (_dictionary,
EnumerationMode.Value);
}
@@ -783,12 +783,12 @@
bool ICollection.IsSynchronized { get { return
((IDictionary) _dictionary).IsSynchronized; } }
object ICollection.SyncRoot { get { return
((IDictionary) _dictionary).SyncRoot; } }
- public struct ValueEnumerator<K, V> : IEnumerator<V>,
IDisposable, IEnumerator
+ public struct ValueEnumerator : IEnumerator<V>,
IDisposable, IEnumerator
{
IEnumerator _hostEnumerator;
internal ValueEnumerator (Dictionary<K, V>
dictionary)
{
- _hostEnumerator = new Enumerator<K, V>
(dictionary, EnumerationMode.Value);
+ _hostEnumerator = new Enumerator
(dictionary, EnumerationMode.Value);
}
public void Dispose ()
Modified: trunk/mcs/class/corlib/System.Collections.Generic/List.cs
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/List.cs 2005-04-28
11:19:19 UTC (rev 43712)
+++ trunk/mcs/class/corlib/System.Collections.Generic/List.cs 2005-04-28
11:37:01 UTC (rev 43713)
@@ -231,9 +231,9 @@
action (t);
}
- public Enumerator <T> GetEnumerator ()
+ public Enumerator GetEnumerator ()
{
- return new Enumerator <T> (this);
+ return new Enumerator (this);
}
[MonoTODO]
@@ -569,7 +569,7 @@
}
}
- public struct Enumerator <T> : IEnumerator <T>, IEnumerator,
IDisposable {
+ public struct Enumerator : IEnumerator <T>, IEnumerator,
IDisposable {
const int NOT_STARTED = -2;
// this MUST be -1, because we depend on it in move
next.
Modified: trunk/mcs/class/corlib/System.Collections.Generic/Queue.cs
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/Queue.cs 2005-04-28
11:19:19 UTC (rev 43712)
+++ trunk/mcs/class/corlib/System.Collections.Generic/Queue.cs 2005-04-28
11:37:01 UTC (rev 43713)
@@ -239,9 +239,9 @@
}
- public Enumerator <T> GetEnumerator ()
+ public Enumerator GetEnumerator ()
{
- return new Enumerator <T> (this);
+ return new Enumerator (this);
}
IEnumerator <T> IEnumerable<T>.GetEnumerator ()
@@ -254,7 +254,7 @@
return GetEnumerator ();
}
- public struct Enumerator <T> : IEnumerator <T>, IEnumerator,
IDisposable {
+ public struct Enumerator : IEnumerator <T>, IEnumerator,
IDisposable {
const int NOT_STARTED = -2;
// this MUST be -1, because we depend on it in move
next.
Modified: trunk/mcs/class/corlib/System.Collections.Generic/Stack.cs
===================================================================
--- trunk/mcs/class/corlib/System.Collections.Generic/Stack.cs 2005-04-28
11:19:19 UTC (rev 43712)
+++ trunk/mcs/class/corlib/System.Collections.Generic/Stack.cs 2005-04-28
11:37:01 UTC (rev 43713)
@@ -184,9 +184,9 @@
}
}
- public Enumerator <T> GetEnumerator ()
+ public Enumerator GetEnumerator ()
{
- return new Enumerator <T> (this);
+ return new Enumerator (this);
}
IEnumerator <T> IEnumerable<T>.GetEnumerator ()
@@ -199,7 +199,7 @@
return GetEnumerator ();
}
- public struct Enumerator <T> : IEnumerator <T>, IEnumerator,
IDisposable {
+ public struct Enumerator : IEnumerator <T>, IEnumerator,
IDisposable {
const int NOT_STARTED = -2;
// this MUST be -1, because we depend on it in move
next.
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
