averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename SequenceType.generate() to SequenceType.iterator()

Browse Source
This commit is contained in:
Dmitri Gribenko
2015-11-03 15:48:40 -08:00
committed by Max Moiseev
parent 2cf172160c
commit 1c0047829a
93 changed files with 392 additions and 392 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdlib/public/core/SequenceAlgorithms.swift.gyb
View File

@@ -75,7 +75,7 @@ extension SequenceType ${"" if preds else "where Iterator.Element : Comparable"}
% end
) ${rethrows_}-> ${GElement}? {
var minResult: ${GElement}? = nil
for e in IteratorSequence(generate()) {
for e in IteratorSequence(iterator()) {
if let currentMinResult = minResult {
% if preds:
if try isOrderedBefore(e, currentMinResult) { minResult = e }
@@ -100,7 +100,7 @@ extension SequenceType ${"" if preds else "where Iterator.Element : Comparable"}
% end
) ${rethrows_}-> ${GElement}? {
var maxResult: ${GElement}? = nil
for e in IteratorSequence(generate()) {
for e in IteratorSequence(iterator()) {
if let currentMaxResult = maxResult {
% if preds:
if try isOrderedBefore(currentMaxResult, e) { maxResult = e }
@@ -154,7 +154,7 @@ else:
@noescape isEquivalent: (${GElement}, ${GElement}) throws -> Bool
% end
) ${rethrows_}-> Bool {
var otherIterator = other.generate()
var otherIterator = other.iterator()
for e0 in self {
if let e1 = otherIterator.next() {
if ${"try !isEquivalent(e0, e1)" if preds else "e0 != e1"} {
@@ -207,8 +207,8 @@ else:
@noescape isEquivalent: (${GElement}, ${GElement}) throws -> Bool
% end
) ${rethrows_}-> Bool {
var g1 = self.generate()
var g2 = other.generate()
var g1 = self.iterator()
var g2 = other.iterator()
while true {
switch (g1.next(), g2.next()) {
case let (e1?, e2?):
@@ -274,8 +274,8 @@ else:
@noescape isOrderedBefore: (${GElement}, ${GElement}) throws -> Bool
% end
) ${rethrows_}-> Bool {
var g1 = self.generate()
var g2 = other.generate()
var g1 = self.iterator()
var g2 = other.iterator()
while true {
if let e1 = g1.next() {
if let e2 = g2.next() {