Rename iterators and fix member visibility (#733)

Author: slozier

Src/IronPython/Runtime/Binding/PythonOperationBinder.cs

@@ -127,24 +127,24 @@ public override T BindDelegate<T>(CallSite<T> site, object[] args) {
         }
 
         private KeyValuePair<IEnumerator, IDisposable> GetListEnumerator(CallSite site, PythonList value) {
-            return new KeyValuePair<IEnumerator,IDisposable>(new ListIterator(value), null);
+            return new KeyValuePair<IEnumerator,IDisposable>(new PythonListIterator(value), null);
         }
 
         private KeyValuePair<IEnumerator, IDisposable> GetListEnumerator(CallSite site, object value) {
             if (value != null && value.GetType() == typeof(PythonList)) {
-                return new KeyValuePair<IEnumerator,IDisposable>(new ListIterator((PythonList)value), null);
+                return new KeyValuePair<IEnumerator,IDisposable>(new PythonListIterator((PythonList)value), null);
             }
 
             return ((CallSite<Func<CallSite, object, KeyValuePair<IEnumerator, IDisposable>>>)site).Update(site, value);
         }
 
         private KeyValuePair<IEnumerator, IDisposable> GetTupleEnumerator(CallSite site, PythonTuple value) {
-            return new KeyValuePair<IEnumerator,IDisposable>(new TupleEnumerator(value), null);
+            return new KeyValuePair<IEnumerator,IDisposable>(new PythonTupleEnumerator(value), null);
         }
 
         private KeyValuePair<IEnumerator, IDisposable> GetTupleEnumerator(CallSite site, object value) {
             if (value != null && value.GetType() == typeof(PythonTuple)) {
-                return new KeyValuePair<IEnumerator, IDisposable>(new TupleEnumerator((PythonTuple)value), null);
+                return new KeyValuePair<IEnumerator, IDisposable>(new PythonTupleEnumerator((PythonTuple)value), null);
             }
 
             return ((CallSite<Func<CallSite, object, KeyValuePair<IEnumerator, IDisposable>>>)site).Update(site, value);

Src/IronPython/Runtime/PythonList.cs

@@ -324,11 +324,11 @@ public virtual IEnumerator __iter__() {
             // we can call it w/o requiring an explicit conversion.  If the
             // user overrides this we'll place a conversion in the wrapper
             // helper
-            return new ListIterator(this);
+            return new PythonListIterator(this);
         }
 
         public virtual IEnumerator __reversed__() {
-            return new ListReverseIterator(this);
+            return new PythonListReverseIterator(this);
         }
 
         public virtual bool __contains__(object value) {
@@ -1421,12 +1421,12 @@ int IStructuralComparable.CompareTo(object other, IComparer comparer) {
     }
 
     [PythonType("list_iterator")]
-    public sealed class ListIterator : IEnumerator, IEnumerable, IEnumerable<object>, IEnumerator<object> {
+    public sealed class PythonListIterator : IEnumerator, IEnumerable, IEnumerable<object>, IEnumerator<object> {
         private int _index;
         private readonly PythonList _list;
         private bool _iterating;
 
-        public ListIterator(PythonList l) {
+        internal PythonListIterator(PythonList l) {
             _list = l;
             Reset();
         }
@@ -1451,17 +1451,20 @@ public void __setstate__(int state) {
 
         #region IEnumerator Members
 
+        [PythonHidden]
         public void Reset() {
             _index = -1;
             _iterating = true;
         }
 
+        [PythonHidden]
         public object Current {
             get {
                 return _list._data[_index];
             }
         }
 
+        [PythonHidden]
         public bool MoveNext() {
             if (_iterating) {
                 _index++;
@@ -1474,6 +1477,7 @@ public bool MoveNext() {
 
         #region IEnumerable Members
 
+        [PythonHidden]
         public IEnumerator GetEnumerator() {
             return this;
         }
@@ -1482,8 +1486,8 @@ public IEnumerator GetEnumerator() {
 
         #region IDisposable Members
 
-        public void Dispose() {
-        }
+        [PythonHidden]
+        public void Dispose() { }
 
         #endregion
 
@@ -1501,12 +1505,12 @@ public int __length_hint__() {
     }
 
     [PythonType("list_reverseiterator")]
-    public sealed class ListReverseIterator : IEnumerator, IEnumerable, IEnumerable<object>, IEnumerator<object> {
+    public sealed class PythonListReverseIterator : IEnumerator, IEnumerable, IEnumerable<object>, IEnumerator<object> {
         private int _index;
         private readonly PythonList _list;
         private bool _iterating;
 
-        public ListReverseIterator(PythonList l) {
+        internal PythonListReverseIterator(PythonList l) {
             _list = l;
             Reset();
         }
@@ -1531,17 +1535,20 @@ public void __setstate__(int state) {
 
         #region IEnumerator Members
 
+        [PythonHidden]
         public void Reset() {
             _index = 0;
             _iterating = true;
         }
 
+        [PythonHidden]
         public object Current {
             get {
                 return _list._data[_list._size - _index];
             }
         }
 
+        [PythonHidden]
         public bool MoveNext() {
             if (_iterating) {
                 _index++;
@@ -1554,6 +1561,7 @@ public bool MoveNext() {
 
         #region IEnumerable Members
 
+        [PythonHidden]
         public IEnumerator GetEnumerator() {
             return this;
         }
@@ -1562,8 +1570,8 @@ public IEnumerator GetEnumerator() {
 
         #region IDisposable Members
 
-        public void Dispose() {
-        }
+        [PythonHidden]
+        public void Dispose() { }
 
         #endregion
 

Src/IronPython/Runtime/PythonTuple.cs

@@ -281,7 +281,7 @@ object ICollection.SyncRoot {
         #endregion
 
         public virtual IEnumerator __iter__() {
-            return new TupleEnumerator(this);
+            return new PythonTupleEnumerator(this);
         }
 
         #region IEnumerable Members
@@ -320,7 +320,7 @@ public object __getnewargs__() {
         #region IEnumerable<object> Members
 
         IEnumerator<object> IEnumerable<object>.GetEnumerator() {
-            return new TupleEnumerator(this);
+            return new PythonTupleEnumerator(this);
         }
 
         #endregion
@@ -614,17 +614,18 @@ public MSAst.Expression CreateExpression() {
     /// public class to get optimized
     /// </summary>
     [PythonType("tuple_iterator")]
-    public sealed class TupleEnumerator : IEnumerable, IEnumerator, IEnumerator<object> {
+    public sealed class PythonTupleEnumerator : IEnumerable, IEnumerator, IEnumerator<object> {
         private int _curIndex;
         private PythonTuple _tuple;
 
-        public TupleEnumerator(PythonTuple t) {
+        internal PythonTupleEnumerator(PythonTuple t) {
             _tuple = t;
             _curIndex = -1;
         }
 
         #region IEnumerator Members
 
+        [PythonHidden]
         public object Current {
             get {
                 // access _data directly because this is what CPython does:
@@ -637,6 +638,7 @@ public object Current {
             }
         }
 
+        [PythonHidden]
         public bool MoveNext() {
             if ((_curIndex + 1) >= _tuple.Count) {
                 return false;
@@ -645,6 +647,7 @@ public bool MoveNext() {
             return true;
         }
 
+        [PythonHidden]
         public void Reset() {
             _curIndex = -1;
         }
@@ -653,6 +656,7 @@ public void Reset() {
 
         #region IDisposable Members
 
+        [PythonHidden]
         public void Dispose() {
             GC.SuppressFinalize(this);
         }
@@ -661,6 +665,7 @@ public void Dispose() {
 
         #region IEnumerable Members
 
+        [PythonHidden]
         public IEnumerator GetEnumerator() {
             return this;
         }