@@ -66,32 +66,31 @@ public func max<T : Comparable>(x: T, _ y: T, _ z: T, _ rest: T...) -> T {
6666 return r
6767}
6868
69- /// The `IteratorProtocol` for `EnumeratedSequence`. `EnumeratedIterator`
70- /// wraps a `Base` `IteratorProtocol` and yields successive `Int` values,
69+ /// The iterator for `EnumeratedSequence`. `EnumeratedIterator`
70+ /// wraps a `Base` iterator and yields successive `Int` values,
7171/// starting at zero, along with the elements of the underlying
7272/// `Base`:
7373///
74- /// var iterator = ["foo", "bar"].enumerate ()
74+ /// var iterator = ["foo", "bar"].enumerated.iterator ()
7575/// iterator.next() // (0, "foo")
7676/// iterator.next() // (1, "bar")
7777/// iterator.next() // nil
78- ///
79- /// - Note: Idiomatic usage is to call `enumerate` instead of
80- /// constructing an `EnumeratedIterator` directly.
8178public struct EnumeratedIterator <
8279 Base : IteratorProtocol
8380> : IteratorProtocol , SequenceType {
84- /// The type of element returned by `next()`.
85- public typealias Element = ( offset: Int , element: Base . Element )
86- var _base : Base
87- var _count : Int
81+
82+ internal var _base : Base
83+ internal var _count : Int
8884
8985 /// Construct from a `Base` iterator.
9086 internal init ( _base: Base ) {
9187 self . _base = _base
9288 self . _count = 0
9389 }
9490
91+ /// The type of element returned by `next()`.
92+ public typealias Element = ( offset: Int , element: Base . Element )
93+
9594 /// Advance to the next element and return it, or `nil` if no next
9695 /// element exists.
9796 ///
@@ -102,16 +101,14 @@ public struct EnumeratedIterator<
102101 }
103102}
104103
105- /// The `SequenceType` returned by `enumerate()`. `EnumeratedSequence`
106- /// is a sequence of pairs (*n*, *x*), where *n*s are consecutive
107- /// `Int`s starting at zero, and *x*s are the elements of a `Base`
108- /// `SequenceType`:
104+ /// The type of the `enumerated` property.
109105///
110- /// var s = EnumeratedSequence(["foo", "bar"])
111- /// Array(s) // [(0, "foo"), (1, "bar")]
106+ /// `EnumeratedSequence` is a sequence of pairs (*n*, *x*), where *n*s
107+ /// are consecutive `Int`s starting at zero, and *x*s are the elements
108+ /// of a `Base` `SequenceType`:
112109///
113- /// - Note: Idiomatic usage is to call `enumerate` instead of
114- /// constructing an `EnumeratedSequence` directly.
110+ /// var s = ["foo", "bar"].enumerated
111+ /// Array(s) // [(0, "foo"), (1, "bar")]
115112public struct EnumeratedSequence < Base : SequenceType > : SequenceType {
116113 internal var _base : Base
117114
0 commit comments