Merge commit '510f29abf77e202780c11d5f6c7449313c819030' into swift-3-indexing-model

This commit is contained in:
Dmitri Gribenko
2016-04-14 13:45:27 -07:00
1151 changed files with 9048 additions and 8911 deletions

View File

@@ -128,7 +128,7 @@ class NonContiguousNSString : NSString {
/// Verify that extended grapheme cluster boundaries in `subject` occur at
/// positions specified in `expectedBoundaries`.
func checkGraphemeClusterSegmentation(
expectedBoundaries: [Int], _ subject: String, _ stackTrace: SourceLocStack
_ expectedBoundaries: [Int], _ subject: String, _ stackTrace: SourceLocStack
) {
var actualBoundaries: [Int] = [ 0 ]
var unicodeScalarCount = 0
@@ -147,7 +147,7 @@ func checkGraphemeClusterSegmentation(
}
func checkGraphemeClusterSegmentation(
expectedBoundaries: [Int], scalars: [UInt32], _ stackTrace: SourceLocStack
_ expectedBoundaries: [Int], scalars: [UInt32], _ stackTrace: SourceLocStack
) {
let subject = NonContiguousNSString(scalars) as String
checkGraphemeClusterSegmentation(expectedBoundaries, subject,
@@ -155,7 +155,7 @@ func checkGraphemeClusterSegmentation(
}
func checkGraphemeClusterSegmentation(
expectedBoundaries: [Int], codeUnits: [UInt16], _ stackTrace: SourceLocStack
_ expectedBoundaries: [Int], codeUnits: [UInt16], _ stackTrace: SourceLocStack
) {
let subject = NonContiguousNSString(codeUnits) as String
checkGraphemeClusterSegmentation(expectedBoundaries, subject,