mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
Merge remote-tracking branch 'origin/master' into swift-3-indexing-model
This commit is contained in:
@@ -134,7 +134,7 @@ func checkGraphemeClusterSegmentation(
|
||||
for c in subject.characters {
|
||||
let currentClusterSize = String(c).unicodeScalars.count
|
||||
unicodeScalarCount += currentClusterSize
|
||||
actualBoundaries += [ unicodeScalarCount ]
|
||||
actualBoundaries += [unicodeScalarCount]
|
||||
}
|
||||
expectEqual(
|
||||
expectedBoundaries, actualBoundaries,
|
||||
@@ -168,9 +168,9 @@ UnicodeTrie.test("GraphemeClusterSegmentation/UnicodeSpec") {
|
||||
% for code_points, expected_boundaries in grapheme_cluster_break_tests:
|
||||
do {
|
||||
let scalars: [UInt32] =
|
||||
[ ${", ".join([ str(cp) for cp in code_points ])} ]
|
||||
[ ${", ".join([str(cp) for cp in code_points])} ]
|
||||
let expectedBoundaries: [Int] =
|
||||
[ ${", ".join([ str(x) for x in expected_boundaries ])} ]
|
||||
[ ${", ".join([str(x) for x in expected_boundaries])} ]
|
||||
checkGraphemeClusterSegmentation(expectedBoundaries, scalars: scalars,
|
||||
SourceLocStack().withCurrentLoc())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user