diff --git a/Sources/Foundation/NSCharacterSet.swift b/Sources/Foundation/NSCharacterSet.swift index 4f948a055a..0148771bbe 100644 --- a/Sources/Foundation/NSCharacterSet.swift +++ b/Sources/Foundation/NSCharacterSet.swift @@ -62,11 +62,11 @@ fileprivate extension String { open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding { typealias CFType = CFCharacterSet - internal var _base = _CFInfo(typeID: CFCharacterSetGetTypeID()) - internal var _hashValue = UInt(0) // CFHashCode - internal var _buffer: UnsafeMutableRawPointer? = nil - internal var _length = Int(0) // CFIndex - internal var _annex: UnsafeMutableRawPointer? = nil + private var _base = _CFInfo(typeID: CFCharacterSetGetTypeID()) + private var _hashValue = UInt(0) // CFHashCode + private var _buffer: UnsafeMutableRawPointer? = nil + private var _length = Int(0) // CFIndex + private var _annex: UnsafeMutableRawPointer? = nil internal var _cfObject: CFType { return unsafeBitCast(self, to: CFType.self) diff --git a/Sources/Foundation/NSCoder.swift b/Sources/Foundation/NSCoder.swift index 4aba9ecef8..3dd5d87641 100644 --- a/Sources/Foundation/NSCoder.swift +++ b/Sources/Foundation/NSCoder.swift @@ -745,7 +745,7 @@ open class NSCoder : NSObject { _hasFailed = true } - internal var _hasFailed = false + internal private(set) var _hasFailed = false open internal(set) var decodingFailurePolicy: NSCoder.DecodingFailurePolicy = .raiseException diff --git a/Sources/Foundation/NSData.swift b/Sources/Foundation/NSData.swift index a9ed6e6984..9892d0968b 100644 --- a/Sources/Foundation/NSData.swift +++ b/Sources/Foundation/NSData.swift @@ -56,7 +56,7 @@ extension NSData { } } -internal final class _NSDataDeallocator { +private final class _NSDataDeallocator { var handler: (UnsafeMutableRawPointer, Int) -> Void = {_,_ in } } @@ -70,12 +70,12 @@ private let __kCFDontDeallocate: CFOptionFlags = 4 open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding { typealias CFType = CFData - internal var _base = _CFInfo(typeID: CFDataGetTypeID()) - internal var _length: Int = 0 // CFIndex - internal var _capacity: Int = 0 // CFIndex - internal var _deallocator: UnsafeMutableRawPointer? = nil // for CF only - internal var _deallocHandler: _NSDataDeallocator? = _NSDataDeallocator() // for Swift - internal var _bytes: UnsafeMutablePointer? = nil + private var _base = _CFInfo(typeID: CFDataGetTypeID()) + private var _length: Int = 0 // CFIndex + private var _capacity: Int = 0 // CFIndex + private var _deallocator: UnsafeMutableRawPointer? = nil // for CF only + private var _deallocHandler: _NSDataDeallocator? = _NSDataDeallocator() // for Swift + private var _bytes: UnsafeMutablePointer? = nil internal final var _cfObject: CFType { if type(of: self) === NSData.self || type(of: self) === NSMutableData.self { @@ -112,7 +112,7 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding { } } - internal init(bytes: UnsafeMutableRawPointer?, length: Int, copy: Bool = false, deallocator: ((UnsafeMutableRawPointer, Int) -> Void)? = nil) { + fileprivate init(bytes: UnsafeMutableRawPointer?, length: Int, copy: Bool = false, deallocator: ((UnsafeMutableRawPointer, Int) -> Void)? = nil) { super.init() _init(bytes: bytes, length: length, copy: copy, deallocator: deallocator) } @@ -340,7 +340,7 @@ open class NSData : NSObject, NSCopying, NSMutableCopying, NSSecureCoding { return NSMutableData(bytes: UnsafeMutableRawPointer(mutating: bytes), length: length, copy: true, deallocator: nil) } - internal func byteDescription(limit: Int? = nil) -> String { + private func byteDescription(limit: Int? = nil) -> String { var s = "" var i = 0 while i < self.length { diff --git a/Sources/Foundation/NSNumber.swift b/Sources/Foundation/NSNumber.swift index dc9d838252..883a44c2ee 100644 --- a/Sources/Foundation/NSNumber.swift +++ b/Sources/Foundation/NSNumber.swift @@ -594,7 +594,7 @@ extension NSNumber : ExpressibleByFloatLiteral, ExpressibleByIntegerLiteral, Exp } -internal struct CFSInt128Struct { +private struct CFSInt128Struct { var high: Int64 var low: UInt64 } @@ -606,8 +606,8 @@ fileprivate func cast(_ t: T) -> U { open class NSNumber : NSValue { typealias CFType = CFNumber // This layout MUST be the same as CFNumber so that they are bridgeable - internal var _base = _CFInfo(typeID: CFNumberGetTypeID()) - internal var _pad: UInt64 = 0 + private var _base = _CFInfo(typeID: CFNumberGetTypeID()) + private var _pad: UInt64 = 0 internal final var _cfObject: CFType { return unsafeBitCast(self, to: CFType.self) @@ -903,7 +903,7 @@ open class NSNumber : NSValue { return .init(truncatingIfNeeded: value.low) } - internal var int128Value: CFSInt128Struct { + private var int128Value: CFSInt128Struct { var value = CFSInt128Struct(high: 0, low: 0) CFNumberGetValue(_cfObject, kCFNumberSInt128Type, &value) return value diff --git a/Sources/Foundation/NSObject.swift b/Sources/Foundation/NSObject.swift index bc0a2a02be..a2bbd0b77d 100644 --- a/Sources/Foundation/NSObject.swift +++ b/Sources/Foundation/NSObject.swift @@ -367,7 +367,7 @@ open class NSObject : NSObjectProtocol, Equatable, Hashable { // Please note: // the following methods are not overridable in swift-corelibs-foundation. - internal class var nsObjectSuperclass: NSObject.Type? { + private class var nsObjectSuperclass: NSObject.Type? { // Pretend that {Swift,}Foundation.NSObject is the top of the class hierarchy. // On Darwin, avoids dipping into the class hierarchy that exists above this class, // which is ultimately rooted in the ObjC NSObject class. diff --git a/Sources/Foundation/Progress.swift b/Sources/Foundation/Progress.swift index 659af7ecb9..11b96ca7a5 100644 --- a/Sources/Foundation/Progress.swift +++ b/Sources/Foundation/Progress.swift @@ -30,14 +30,14 @@ import Dispatch */ open class Progress : NSObject { - internal weak var _parent : Progress? - internal var _children : Set - internal var _selfFraction : _ProgressFraction - internal var _childFraction : _ProgressFraction - internal var _userInfo : [ProgressUserInfoKey : Any] + private weak var _parent : Progress? + private var _children : Set + private var _selfFraction : _ProgressFraction + private var _childFraction : _ProgressFraction + private var _userInfo : [ProgressUserInfoKey : Any] // This is set once, but after initialization - internal var _portionOfParent : Int64 + private var _portionOfParent : Int64 static private var _tsdKey = "_Foundation_CurrentProgressKey" @@ -167,7 +167,7 @@ open class Progress : NSObject { } } - internal func _setParent(_ parent: Progress, portion: Int64) { + private func _setParent(_ parent: Progress, portion: Int64) { _parent = parent _portionOfParent = portion @@ -416,18 +416,18 @@ open class Progress : NSObject { // MARK: - // MARK: Implementation of unit counts - internal var _overallFraction : _ProgressFraction { + private var _overallFraction : _ProgressFraction { return _selfFraction + _childFraction } - internal func _addCompletedUnitCount(_ unitCount : Int64) { + private func _addCompletedUnitCount(_ unitCount : Int64) { let old = _overallFraction _selfFraction.completed += unitCount let new = _overallFraction _updateFractionCompleted(from: old, to: new) } - internal func _updateFractionCompleted(from: _ProgressFraction, to: _ProgressFraction) { + private func _updateFractionCompleted(from: _ProgressFraction, to: _ProgressFraction) { if from != to { _parent?._updateChild(self, from: from, to: to, portion: _portionOfParent) } diff --git a/Tests/Foundation/Tests/TestNSData.swift b/Tests/Foundation/Tests/TestNSData.swift index 6961f25193..72cbc9b3a9 100644 --- a/Tests/Foundation/Tests/TestNSData.swift +++ b/Tests/Foundation/Tests/TestNSData.swift @@ -20,7 +20,7 @@ import CoreFoundation class TestNSData: LoopbackServerTest { class AllOnesImmutableData : NSData { - private var __length : Int + private var _length : Int var _pointer : UnsafeMutableBufferPointer? { willSet { if let p = _pointer { free(p.baseAddress) } @@ -28,7 +28,7 @@ class TestNSData: LoopbackServerTest { } init(length: Int) { - __length = length + _length = length super.init() } @@ -45,7 +45,7 @@ class TestNSData: LoopbackServerTest { override var length : Int { get { - return __length + return _length } } @@ -78,7 +78,7 @@ class TestNSData: LoopbackServerTest { class AllOnesData : NSMutableData { - private var __length : Int + private var _length : Int var _pointer : UnsafeMutableBufferPointer? { willSet { if let p = _pointer { free(p.baseAddress) } @@ -86,7 +86,7 @@ class TestNSData: LoopbackServerTest { } override init(length: Int) { - __length = length + _length = length super.init() } @@ -103,22 +103,22 @@ class TestNSData: LoopbackServerTest { override var length : Int { get { - return __length + return _length } set { if let ptr = _pointer { // Copy the data to our new length buffer let newBuffer = malloc(newValue)! - if newValue <= __length { + if newValue <= _length { memmove(newBuffer, ptr.baseAddress!, newValue) - } else if newValue > __length { - memmove(newBuffer, ptr.baseAddress!, __length) - memset(newBuffer + __length, 1, newValue - __length) + } else if newValue > _length { + memmove(newBuffer, ptr.baseAddress!, _length) + memset(newBuffer + _length, 1, newValue - _length) } let bytePtr = newBuffer.bindMemory(to: UInt8.self, capacity: newValue) _pointer = UnsafeMutableBufferPointer(start: bytePtr, count: newValue) } - __length = newValue + _length = newValue } } @@ -138,7 +138,7 @@ class TestNSData: LoopbackServerTest { } override var mutableBytes: UnsafeMutableRawPointer { - let newBufferLength = __length + let newBufferLength = _length let newBuffer = malloc(newBufferLength) if let ptr = _pointer { // Copy the existing data to the new box, then return its pointer @@ -150,7 +150,7 @@ class TestNSData: LoopbackServerTest { let bytePtr = newBuffer!.bindMemory(to: UInt8.self, capacity: newBufferLength) let result = UnsafeMutableBufferPointer(start: bytePtr, count: newBufferLength) _pointer = result - __length = newBufferLength + _length = newBufferLength return UnsafeMutableRawPointer(result.baseAddress!) }