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

Rename 'subrange' to 'bounds' in non-API arguments

Browse Source
This commit is contained in:
Dmitri Gribenko
2015-11-04 14:12:17 -08:00
committed by Max Moiseev
parent 3910a00a35
commit ab0a2a6044
17 changed files with 160 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
stdlib/public/core/StringBuffer.swift
View File

@@ -187,17 +187,17 @@ public struct _StringBuffer {
/// - the buffer is uniquely-refereced, or
/// - `oldUsedEnd` points to the end of the currently used capacity.
///
/// - parameter subRange: Range of the substring that the caller tries
/// - parameter bounds: Range of the substring that the caller tries
/// to extend.
/// - parameter newUsedCount: The desired size of the substring.
mutating func grow(
subRange: Range<UnsafePointer<RawByte>>, newUsedCount: Int
bounds: Range<UnsafePointer<RawByte>>, newUsedCount: Int
) -> Bool {
var newUsedCount = newUsedCount
// The substring to be grown could be pointing in the middle of this
// _StringBuffer. Adjust the size so that it covers the imaginary
// substring from the start of the buffer to `oldUsedEnd`.
newUsedCount += (subRange.startIndex - UnsafePointer(start)) >> elementShift
newUsedCount += (bounds.startIndex - UnsafePointer(start)) >> elementShift
if _slowPath(newUsedCount > capacity) {
return false
@@ -215,13 +215,13 @@ public struct _StringBuffer {
// place. The operation should be implemented in a thread-safe way,
// though.
//
// if usedEnd == subRange.endIndex {
// if usedEnd == bounds.endIndex {
// usedEnd = newUsedEnd
// return true
// }
let usedEndPhysicalPtr =
UnsafeMutablePointer<UnsafeMutablePointer<RawByte>>(_storage._value)
var expected = UnsafeMutablePointer<RawByte>(subRange.endIndex)
var expected = UnsafeMutablePointer<RawByte>(bounds.endIndex)
if _stdlib_atomicCompareExchangeStrongPtr(
object: usedEndPhysicalPtr, expected: &expected, desired: newUsedEnd) {
return true