[stdlib] Mark NFD and NFC as SPI #42124
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| //===----------------------------------------------------------------------===// | ||
| // | ||
| // This source file is part of the Swift.org open source project | ||
| // | ||
| // Copyright (c) 2022 Apple Inc. and the Swift project authors | ||
| // Licensed under Apache License v2.0 with Runtime Library Exception | ||
| // | ||
| // See https://swift.org/LICENSE.txt for license information | ||
| // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors | ||
| // | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| //===----------------------------------------------------------------------===// | ||
| // Unicode.NFD | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| extension Unicode { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public struct _NFD { | ||
| let base: Substring.UnicodeScalarView | ||
| } | ||
| } | ||
|
|
||
| @available(SwiftStdlib 5.7, *) | ||
| extension Unicode._NFD { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public struct Iterator { | ||
| var base: Unicode._InternalNFD<Substring>.Iterator | ||
|
|
||
| } | ||
| } | ||
|
|
||
| @available(SwiftStdlib 5.7, *) | ||
| extension Unicode._NFD.Iterator: IteratorProtocol { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public mutating func next() -> Unicode.Scalar? { | ||
| base.next()?.scalar | ||
| } | ||
| } | ||
|
|
||
| @available(SwiftStdlib 5.7, *) | ||
| extension Unicode._NFD: Sequence { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public func makeIterator() -> Iterator { | ||
| Iterator(base: Unicode._InternalNFD(base: base).makeIterator()) | ||
| } | ||
| } | ||
|
|
||
| extension String { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public var _nfd: Unicode._NFD { | ||
| Unicode._NFD(base: self[...].unicodeScalars) | ||
| } | ||
| } | ||
|
|
||
| extension Substring { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public var _nfd: Unicode._NFD { | ||
| Unicode._NFD(base: unicodeScalars) | ||
| } | ||
| } | ||
|
|
||
| //===----------------------------------------------------------------------===// | ||
| // Unicode.NFC | ||
| //===----------------------------------------------------------------------===// | ||
|
|
||
| extension Unicode { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public struct _NFC { | ||
| let base: Substring.UnicodeScalarView | ||
|
|
||
| } | ||
| } | ||
|
|
||
| @available(SwiftStdlib 5.7, *) | ||
| extension Unicode._NFC { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public struct Iterator { | ||
| var base: Unicode._InternalNFC<Substring>.Iterator | ||
|
|
||
| } | ||
| } | ||
|
|
||
| @available(SwiftStdlib 5.7, *) | ||
| extension Unicode._NFC.Iterator: IteratorProtocol { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public mutating func next() -> Unicode.Scalar? { | ||
| base.next() | ||
| } | ||
| } | ||
|
|
||
| @available(SwiftStdlib 5.7, *) | ||
| extension Unicode._NFC: Sequence { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public func makeIterator() -> Iterator { | ||
| Iterator( | ||
| base: Unicode._InternalNFC<Substring>.Iterator( | ||
| iterator: Unicode._InternalNFD<Substring>(base: base).makeIterator() | ||
| ) | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| extension String { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public var _nfc: Unicode._NFC { | ||
| Unicode._NFC(base: self[...].unicodeScalars) | ||
| } | ||
| } | ||
|
|
||
| extension Substring { | ||
| @_spi(_Unicode) | ||
| @available(SwiftStdlib 5.7, *) | ||
| public var _nfc: Unicode._NFC { | ||
| Unicode._NFC(base: unicodeScalars) | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
To avoid surprises, I recommend spelling out the memberwise initializer here. The compiler-provided one probably works fine, but it usually is a good idea to be explicit about things that might get exposed.
(E.g. I don't know for sure if the implicit initializer will be declared public or internal.
internalwould make more sense, but ¯\_(ツ)_/¯)