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

Correct mistake where some 'pred' arguments became 'predecessor' instead of 'predicate'.

Browse Source 
Thanks to Dmitri and Joe for pointing this out.

Swift SVN r19151
This commit is contained in:
Ted Kremenek
2014-06-24 23:47:00 +00:00
parent 7667b829bb
commit 0ce574eb9e
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
stdlib/core/Algorithm.swift
View File

@@ -180,9 +180,9 @@ struct Less<T: Comparable> {
C: MutableCollection where C.IndexType: RandomAccessIndex C: MutableCollection where C.IndexType: RandomAccessIndex
>( >(
inout collection: C, inout collection: C,
predecessor: (C.GeneratorType.Element, C.GeneratorType.Element) -> Bool predicate: (C.GeneratorType.Element, C.GeneratorType.Element) -> Bool
) { ) {
quickSort(&collection, indices(collection), predecessor) quickSort(&collection, indices(collection), predicate)
} }
@public func sort< @public func sort<
@@ -194,9 +194,9 @@ struct Less<T: Comparable> {
quickSort(&collection, indices(collection)) quickSort(&collection, indices(collection))
} }
@public func sort<T>(inout array: T[], predecessor: (T, T) -> Bool) { @public func sort<T>(inout array: T[], predicate: (T, T) -> Bool) {
return array.withMutableStorage { return array.withMutableStorage {
a in sort(&a, predecessor) a in sort(&a, predicate)
return return
} }
} }
@@ -215,10 +215,10 @@ struct Less<T: Comparable> {
C: MutableCollection where C.IndexType: RandomAccessIndex C: MutableCollection where C.IndexType: RandomAccessIndex
>( >(
source: C, source: C,
predecessor: (C.GeneratorType.Element, C.GeneratorType.Element) -> Bool predicate: (C.GeneratorType.Element, C.GeneratorType.Element) -> Bool
) -> C { ) -> C {
var result = source var result = source
sort(&result, predecessor) sort(&result, predicate)
return result return result
} }
@@ -235,10 +235,10 @@ struct Less<T: Comparable> {
S: Sequence S: Sequence
>( >(
source: S, source: S,
predecessor: (S.GeneratorType.Element, S.GeneratorType.Element) -> Bool predicate: (S.GeneratorType.Element, S.GeneratorType.Element) -> Bool
) -> S.GeneratorType.Element[] { ) -> S.GeneratorType.Element[] {
var result = Array(source) var result = Array(source)
sort(&result, predecessor) sort(&result, predicate)
return result return result
} }
@@ -557,7 +557,7 @@ func _quickSort<
where where
S1.GeneratorType.Element == S2.GeneratorType.Element S1.GeneratorType.Element == S2.GeneratorType.Element
>(a1: S1, a2: S2, >(a1: S1, a2: S2,
predecessor: (S1.GeneratorType.Element, S1.GeneratorType.Element) -> Bool) -> Bool predicate: (S1.GeneratorType.Element, S1.GeneratorType.Element) -> Bool) -> Bool
{ {
var g1 = a1.generate() var g1 = a1.generate()
var g2 = a2.generate() var g2 = a2.generate()
@@ -565,7 +565,7 @@ func _quickSort<
var e1 = g1.next() var e1 = g1.next()
var e2 = g2.next() var e2 = g2.next()
if e1 && e2 { if e1 && e2 {
if !predecessor(e1!, e2!) { if !predicate(e1!, e2!) {
return false return false
} }
} }

4
test/Constraints/closures.swift
View File

@@ -12,8 +12,8 @@ func foo(x: (Int, Int) -> Int) {}
foo({$0}) // expected-error{{cannot convert the expression's type '()' to type 'Int'}} foo({$0}) // expected-error{{cannot convert the expression's type '()' to type 'Int'}}
struct X {} struct X {}
func mySort(array: String[], predecessor: (String, String) -> Bool) -> String[] {} func mySort(array: String[], predicate: (String, String) -> Bool) -> String[] {}
func mySort(array: X[], predecessor: (X, X) -> Bool) -> X[] {} func mySort(array: X[], predicate: (X, X) -> Bool) -> X[] {}
var strings : String[] var strings : String[]
mySort(strings, { x, y in x < y }) mySort(strings, { x, y in x < y })

16
test/Generics/algorithms.swift
View File

@@ -25,10 +25,10 @@ func find<R : Generator where R.Element : Eq>
return result return result
} }
func findIf<R : Generator>(range: R, predecessor: (R.Element) -> Bool) -> R { func findIf<R : Generator>(range: R, predicate: (R.Element) -> Bool) -> R {
var result = range var result = range
for x in GeneratorSequence(range) { for x in GeneratorSequence(range) {
if predecessor(x) { if predicate(x) {
break break
} }
result.next() result.next()
@@ -47,10 +47,10 @@ func count<R : Generator where R.Element : Eq>
return result return result
} }
func countIf<R : Generator>(range: R, predecessor: (R.Element) -> Bool) -> Int { func countIf<R : Generator>(range: R, predicate: (R.Element) -> Bool) -> Int {
var result = 0 var result = 0
for x in GeneratorSequence(range) { for x in GeneratorSequence(range) {
if predecessor(x) { if predicate(x) {
++result ++result
} }
} }
@@ -76,12 +76,12 @@ func equal<R1 : Generator, R2 : Generator where R1.Element : Eq,
func equalIf<R1 : Generator, R2 : Generator> func equalIf<R1 : Generator, R2 : Generator>
(var range1 : R1, var range2 : R2, (var range1 : R1, var range2 : R2,
predecessor : (R1.Element, R2.Element)-> Bool) -> Bool { predicate : (R1.Element, R2.Element)-> Bool) -> Bool {
var e1 = range1.next() var e1 = range1.next()
var e2 = range2.next() var e2 = range2.next()
while e1 && e2 { while e1 && e2 {
if !predecessor(e1!, e2!) { if !predicate(e1!, e2!) {
return false return false
} }
e1 = range1.next() e1 = range1.next()
@@ -108,13 +108,13 @@ func mismatch<R1 : Generator, R2 : Generator where R1.Element : Eq,
func mismatchIf<R1 : Generator, R2 : Generator> func mismatchIf<R1 : Generator, R2 : Generator>
(var range1 : R1, var range2 : R2, (var range1 : R1, var range2 : R2,
predecessor : (R1.Element, R2.Element) -> Bool) -> (R1, R2) { predicate : (R1.Element, R2.Element) -> Bool) -> (R1, R2) {
var prev1 = range1, prev2 = range2 var prev1 = range1, prev2 = range2
while true { while true {
var e1 = range1.next(), e2 = range2.next() var e1 = range1.next(), e2 = range2.next()
if !e1 || !e2 || !predecessor(e1!, e2!) { break } if !e1 || !e2 || !predicate(e1!, e2!) { break }
prev1.next() prev1.next()
prev2.next() prev2.next()
} }