From bd5a40ff1bdb3db58df2a7a6a0736ce58c1907da Mon Sep 17 00:00:00 2001 From: Michael Ilseman Date: Thu, 27 Jun 2019 11:11:44 -0700 Subject: [PATCH] [gardening] Add underscore to internal member --- stdlib/public/core/StringCharacterView.swift | 10 +++++----- stdlib/public/core/StringGuts.swift | 4 ++-- stdlib/public/core/StringIndex.swift | 6 +++--- stdlib/public/core/StringUTF16View.swift | 6 +++--- .../public/core/StringUnicodeScalarView.swift | 8 ++++---- stdlib/public/core/UnicodeHelpers.swift | 18 +++++++++--------- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/stdlib/public/core/StringCharacterView.swift b/stdlib/public/core/StringCharacterView.swift index 551a00ff251..2759518f9d2 100644 --- a/stdlib/public/core/StringCharacterView.swift +++ b/stdlib/public/core/StringCharacterView.swift @@ -64,10 +64,10 @@ extension String: BidirectionalCollection { let stride = _characterStride(startingAt: i) let nextOffset = i._encodedOffset &+ stride let nextStride = _characterStride( - startingAt: Index(_encodedOffset: nextOffset).aligned) + startingAt: Index(_encodedOffset: nextOffset)._aligned) return Index( - encodedOffset: nextOffset, characterStride: nextStride).aligned + encodedOffset: nextOffset, characterStride: nextStride)._aligned } /// Returns the position immediately before the given index. @@ -82,7 +82,7 @@ extension String: BidirectionalCollection { let i = _guts.scalarAlign(i) let stride = _characterStride(endingAt: i) let priorOffset = i._encodedOffset &- stride - return Index(encodedOffset: priorOffset, characterStride: stride).aligned + return Index(encodedOffset: priorOffset, characterStride: stride)._aligned } /// Returns an index that is the specified distance from the given index. /// @@ -200,7 +200,7 @@ extension String: BidirectionalCollection { @inlinable @inline(__always) internal func _characterStride(startingAt i: Index) -> Int { - _internalInvariant(i.isAligned) + _internalInvariant(i._isAligned) // Fast check if it's already been measured, otherwise check resiliently if let d = i.characterStride { return d } @@ -212,7 +212,7 @@ extension String: BidirectionalCollection { @inlinable @inline(__always) internal func _characterStride(endingAt i: Index) -> Int { - _internalInvariant(i.isAligned) + _internalInvariant(i._isAligned) if i == startIndex { return 0 } diff --git a/stdlib/public/core/StringGuts.swift b/stdlib/public/core/StringGuts.swift index eca8696ad83..7f512a3467a 100644 --- a/stdlib/public/core/StringGuts.swift +++ b/stdlib/public/core/StringGuts.swift @@ -268,11 +268,11 @@ extension _StringGuts { @inlinable @inline(__always) internal var startIndex: String.Index { - return Index(_encodedOffset: 0).aligned + return Index(_encodedOffset: 0)._aligned } @inlinable @inline(__always) internal var endIndex: String.Index { - return Index(_encodedOffset: self.count).aligned + return Index(_encodedOffset: self.count)._aligned } } diff --git a/stdlib/public/core/StringIndex.swift b/stdlib/public/core/StringIndex.swift index 7429faa1b60..84f6931d589 100644 --- a/stdlib/public/core/StringIndex.swift +++ b/stdlib/public/core/StringIndex.swift @@ -152,7 +152,7 @@ extension String.Index { @usableFromInline @inline(never) @_effects(releasenone) internal func _invariantCheck() { _internalInvariant(_encodedOffset >= 0) - if self.isAligned { + if self._isAligned { _internalInvariant(transcodedOffset == 0) } } @@ -249,11 +249,11 @@ extension String.Index { extension String.Index { @_alwaysEmitIntoClient // Swift 5.1 @inline(__always) - internal var isAligned: Bool { return 0 != _rawBits & 0x2000 } + internal var _isAligned: Bool { return 0 != _rawBits & 0x2000 } @_alwaysEmitIntoClient // Swift 5.1 @inline(__always) - internal var aligned: String.Index { + internal var _aligned: String.Index { var idx = self idx._rawBits |= 0x2000 idx._invariantCheck() diff --git a/stdlib/public/core/StringUTF16View.swift b/stdlib/public/core/StringUTF16View.swift index be0361f148a..78730fd40eb 100644 --- a/stdlib/public/core/StringUTF16View.swift +++ b/stdlib/public/core/StringUTF16View.swift @@ -154,7 +154,7 @@ extension String.UTF16View: BidirectionalCollection { if len == 4 && idx.transcodedOffset == 0 { return idx.nextTranscoded } - return idx.strippingTranscoding.encoded(offsetBy: len).aligned + return idx.strippingTranscoding.encoded(offsetBy: len)._aligned } @inlinable @inline(__always) @@ -178,7 +178,7 @@ extension String.UTF16View: BidirectionalCollection { // Single UTF-16 code unit _internalInvariant((1...3) ~= len) - return idx.encoded(offsetBy: -len).aligned + return idx.encoded(offsetBy: -len)._aligned } public func index(_ i: Index, offsetBy n: Int) -> Index { @@ -587,7 +587,7 @@ extension String.UTF16View { _internalInvariant(utf16Len == 2) return Index(encodedOffset: readIdx, transcodedOffset: 1) } - return Index(_encodedOffset: readIdx &+ len).aligned + return Index(_encodedOffset: readIdx &+ len)._aligned } readIdx &+= len diff --git a/stdlib/public/core/StringUnicodeScalarView.swift b/stdlib/public/core/StringUnicodeScalarView.swift index 349a377951e..a2bedabeebf 100644 --- a/stdlib/public/core/StringUnicodeScalarView.swift +++ b/stdlib/public/core/StringUnicodeScalarView.swift @@ -112,7 +112,7 @@ extension String.UnicodeScalarView: BidirectionalCollection { if _fastPath(_guts.isFastUTF8) { let len = _guts.fastUTF8ScalarLength(startingAt: i._encodedOffset) - return i.encoded(offsetBy: len).aligned + return i.encoded(offsetBy: len)._aligned } return _foreignIndex(after: i) @@ -137,7 +137,7 @@ extension String.UnicodeScalarView: BidirectionalCollection { return _utf8ScalarLength(utf8, endingAt: i._encodedOffset) } _internalInvariant(len <= 4, "invalid UTF8") - return i.encoded(offsetBy: -len).aligned + return i.encoded(offsetBy: -len)._aligned } return _foreignIndex(before: i) @@ -419,7 +419,7 @@ extension String.UnicodeScalarView { let cu = _guts.foreignErrorCorrectedUTF16CodeUnit(at: i) let len = UTF16.isLeadSurrogate(cu) ? 2 : 1 - return i.encoded(offsetBy: len).aligned + return i.encoded(offsetBy: len)._aligned } @usableFromInline @inline(never) @@ -430,6 +430,6 @@ extension String.UnicodeScalarView { let cu = _guts.foreignErrorCorrectedUTF16CodeUnit(at: priorIdx) let len = UTF16.isTrailSurrogate(cu) ? 2 : 1 - return i.encoded(offsetBy: -len).aligned + return i.encoded(offsetBy: -len)._aligned } } diff --git a/stdlib/public/core/UnicodeHelpers.swift b/stdlib/public/core/UnicodeHelpers.swift index 7ca3084ba65..f68459e6ccf 100644 --- a/stdlib/public/core/UnicodeHelpers.swift +++ b/stdlib/public/core/UnicodeHelpers.swift @@ -163,7 +163,7 @@ extension _StringGuts { @inline(__always) // fast-path: fold common fastUTF8 check internal func scalarAlign(_ idx: Index) -> Index { let result: String.Index - if _fastPath(idx.isAligned) { + if _fastPath(idx._isAligned) { result = idx } else { // TODO(String performance): isASCII check @@ -172,28 +172,28 @@ extension _StringGuts { _internalInvariant(isOnUnicodeScalarBoundary(result), "Alignment bit is set for non-aligned index") - _internalInvariant(result.isAligned) + _internalInvariant(result._isAligned) return result } @inline(never) // slow-path @_alwaysEmitIntoClient // Swift 5.1 internal func scalarAlignSlow(_ idx: Index) -> Index { - _internalInvariant(!idx.isAligned) + _internalInvariant(!idx._isAligned) if _slowPath(idx.transcodedOffset != 0 || idx._encodedOffset == 0) { // Transcoded index offsets are already scalar aligned - return String.Index(_encodedOffset: idx._encodedOffset).aligned + return String.Index(_encodedOffset: idx._encodedOffset)._aligned } if _slowPath(self.isForeign) { let foreignIdx = foreignScalarAlign(idx) - _internalInvariant(foreignIdx.isAligned) + _internalInvariant(foreignIdx._isAligned) return foreignIdx } return String.Index(_encodedOffset: self.withFastUTF8 { _scalarAlign($0, idx._encodedOffset) } - ).aligned + )._aligned } @inlinable @@ -359,17 +359,17 @@ extension _StringGuts { @usableFromInline @inline(never) // slow-path @_effects(releasenone) internal func foreignScalarAlign(_ idx: Index) -> Index { - guard idx._encodedOffset != self.count else { return idx.aligned } + guard idx._encodedOffset != self.count else { return idx._aligned } _internalInvariant(idx._encodedOffset < self.count) let ecCU = foreignErrorCorrectedUTF16CodeUnit(at: idx) if _fastPath(!UTF16.isTrailSurrogate(ecCU)) { - return idx.aligned + return idx._aligned } _internalInvariant(idx._encodedOffset > 0, "Error-correction shouldn't give trailing surrogate at position zero") - return String.Index(_encodedOffset: idx._encodedOffset &- 1).aligned + return String.Index(_encodedOffset: idx._encodedOffset &- 1)._aligned } @usableFromInline @inline(never)