mirror of
https://github.com/apple/swift.git
synced 2025-12-21 12:14:44 +01:00
Tag everything in the standard library with accessibility attributes.
Keep calm: remember that the standard library has many more public exports than the average target, and that this contains ALL of them at once. I also deliberately tried to tag nearly every top-level decl, even if that was just to explicitly mark things @internal, to make sure I didn't miss something. This does export more than we might want to, mostly for protocol conformance reasons, along with our simple-but-limiting typealias rule. I tried to also mark things private where possible, but it's really going to be up to the standard library owners to get this right. This is also only validated against top-level access control; I haven't fully tested against member-level access control yet, and none of our semantic restrictions are in place. Along the way I also noticed bits of stdlib cruft; to keep this patch understandable, I didn't change any of them. Swift SVN r19145
This commit is contained in:
@@ -10,7 +10,7 @@
|
||||
//
|
||||
//===----------------------------------------------------------------------===//
|
||||
|
||||
func ==(
|
||||
@public func ==(
|
||||
lhs: String.UnicodeScalarView.IndexType,
|
||||
rhs: String.UnicodeScalarView.IndexType
|
||||
) -> Bool {
|
||||
@@ -18,7 +18,7 @@ func ==(
|
||||
}
|
||||
|
||||
extension String {
|
||||
struct UnicodeScalarView : Sliceable, Sequence {
|
||||
@public struct UnicodeScalarView : Sliceable, Sequence {
|
||||
init(_ _base: _StringCore) {
|
||||
self._base = _base
|
||||
}
|
||||
@@ -35,22 +35,20 @@ extension String {
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: This index should probably become bidirectional, as UTF16
|
||||
// is traversable in either direction.
|
||||
struct IndexType : BidirectionalIndex {
|
||||
@public struct IndexType : BidirectionalIndex {
|
||||
init(_ _position: Int, _ _base: _StringCore) {
|
||||
self._position = _position
|
||||
self._base = _base
|
||||
}
|
||||
|
||||
func successor() -> IndexType {
|
||||
@public func successor() -> IndexType {
|
||||
var scratch = _ScratchGenerator(_base, _position)
|
||||
var decoder = UTF16()
|
||||
let (result, length) = decoder._decodeOne(&scratch)
|
||||
return IndexType(_position + length, _base)
|
||||
}
|
||||
|
||||
func predecessor() -> IndexType {
|
||||
@public func predecessor() -> IndexType {
|
||||
var i = _position
|
||||
let codeUnit = self._base[--i]
|
||||
// FIXME: consider adding:
|
||||
@@ -65,15 +63,15 @@ extension String {
|
||||
var _base: _StringCore
|
||||
}
|
||||
|
||||
var startIndex: IndexType {
|
||||
@public var startIndex: IndexType {
|
||||
return IndexType(_base.startIndex, _base)
|
||||
}
|
||||
|
||||
var endIndex: IndexType {
|
||||
@public var endIndex: IndexType {
|
||||
return IndexType(_base.endIndex, _base)
|
||||
}
|
||||
|
||||
subscript(i: IndexType) -> UnicodeScalar {
|
||||
@public subscript(i: IndexType) -> UnicodeScalar {
|
||||
var scratch = _ScratchGenerator(_base, i._position)
|
||||
var decoder = UTF16()
|
||||
switch decoder.decode(&scratch) {
|
||||
@@ -86,21 +84,22 @@ extension String {
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
func __slice__(start: IndexType, end: IndexType) -> UnicodeScalarView {
|
||||
return UnicodeScalarView(_base[start._position..<end._position])
|
||||
}
|
||||
|
||||
subscript(r: Range<IndexType>) -> UnicodeScalarView {
|
||||
@public subscript(r: Range<IndexType>) -> UnicodeScalarView {
|
||||
return UnicodeScalarView(
|
||||
_base[r.startIndex._position..<r.endIndex._position])
|
||||
}
|
||||
|
||||
struct GeneratorType : Generator {
|
||||
@public struct GeneratorType : Generator {
|
||||
init(_ _base: _StringCore.GeneratorType) {
|
||||
self._base = _base
|
||||
}
|
||||
|
||||
mutating func next() -> UnicodeScalar? {
|
||||
@public mutating func next() -> UnicodeScalar? {
|
||||
switch _decoder.decode(&self._base) {
|
||||
case .Result(let us):
|
||||
return us
|
||||
@@ -114,16 +113,16 @@ extension String {
|
||||
var _base: _StringCore.GeneratorType
|
||||
}
|
||||
|
||||
func generate() -> GeneratorType {
|
||||
@public func generate() -> GeneratorType {
|
||||
return GeneratorType(_base.generate())
|
||||
}
|
||||
|
||||
@conversion
|
||||
@conversion @public
|
||||
func __conversion() -> String {
|
||||
return String(_base)
|
||||
}
|
||||
|
||||
func compare(other : UnicodeScalarView) -> Int {
|
||||
@public func compare(other : UnicodeScalarView) -> Int {
|
||||
// Try to compare the string without decoding
|
||||
// the UTF16 string.
|
||||
var aIdx = self._base.startIndex
|
||||
@@ -211,10 +210,10 @@ extension String {
|
||||
}
|
||||
|
||||
extension String {
|
||||
func compare(other : String) -> Int {
|
||||
@public func compare(other : String) -> Int {
|
||||
return(UnicodeScalarView(core).compare(UnicodeScalarView(other.core)))
|
||||
}
|
||||
var unicodeScalars : UnicodeScalarView {
|
||||
@public var unicodeScalars : UnicodeScalarView {
|
||||
return UnicodeScalarView(core)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user