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

[gardening] Clean up many String computed vars

Browse Source
This commit is contained in:
Michael Ilseman
2019-04-08 11:08:43 -07:00
parent 5150981150
commit f7cdda2720
10 changed files with 218 additions and 330 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
stdlib/public/core/StringIndex.swift
View File

@@ -49,18 +49,13 @@ extension String {
}
extension String.Index {
@inlinable
internal var orderingValue: UInt64 {
// TODO(String micro-performance): Consider mask instead of shift
@inline(__always) get { return _rawBits &>> 14 }
}
@inlinable @inline(__always)
internal var orderingValue: UInt64 { return _rawBits &>> 14 }
// Whether this is at the canonical "start" position, that is encoded AND
// transcoded offset of 0.
@inlinable
internal var isZeroPosition: Bool {
@inline(__always) get { return orderingValue == 0 }
}
@inlinable @inline(__always)
internal var isZeroPosition: Bool { return orderingValue == 0 }
/// The UTF-16 code unit offset corresponding to this Index
public func utf16Offset<S: StringProtocol>(in s: S) -> Int {
@@ -80,11 +75,9 @@ extension String.Index {
return Int(truncatingIfNeeded: _rawBits &>> 16)
}
@inlinable
@inlinable @inline(__always)
internal var transcodedOffset: Int {
@inline(__always) get {
return Int(truncatingIfNeeded: orderingValue & 0x3)
}
return Int(truncatingIfNeeded: orderingValue & 0x3)
}
@usableFromInline
@@ -164,45 +157,35 @@ extension String.Index {
// Creation helpers, which will make migration easier if we decide to use and
// propagate the reserved bits.
extension String.Index {
@inlinable
@inlinable @inline(__always)
internal var strippingTranscoding: String.Index {
@inline(__always) get {
return String.Index(_encodedOffset: self._encodedOffset)
}
return String.Index(_encodedOffset: self._encodedOffset)
}
@inlinable
@inlinable @inline(__always)
internal var nextEncoded: String.Index {
@inline(__always) get {
_internalInvariant(self.transcodedOffset == 0)
return String.Index(_encodedOffset: self._encodedOffset &+ 1)
}
_internalInvariant(self.transcodedOffset == 0)
return String.Index(_encodedOffset: self._encodedOffset &+ 1)
}
@inlinable
@inlinable @inline(__always)
internal var priorEncoded: String.Index {
@inline(__always) get {
_internalInvariant(self.transcodedOffset == 0)
return String.Index(_encodedOffset: self._encodedOffset &- 1)
}
_internalInvariant(self.transcodedOffset == 0)
return String.Index(_encodedOffset: self._encodedOffset &- 1)
}
@inlinable
@inlinable @inline(__always)
internal var nextTranscoded: String.Index {
@inline(__always) get {
return String.Index(
encodedOffset: self._encodedOffset,
transcodedOffset: self.transcodedOffset &+ 1)
}
return String.Index(
encodedOffset: self._encodedOffset,
transcodedOffset: self.transcodedOffset &+ 1)
}
@inlinable
@inlinable @inline(__always)
internal var priorTranscoded: String.Index {
@inline(__always) get {
return String.Index(
encodedOffset: self._encodedOffset,
transcodedOffset: self.transcodedOffset &- 1)
}
return String.Index(
encodedOffset: self._encodedOffset,
transcodedOffset: self.transcodedOffset &- 1)
}
// Get an index with an encoded offset relative to this one.