Skip to content

[stdlib] Remove dead code #20479

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions stdlib/public/core/Unicode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -477,13 +477,6 @@ extension Unicode.UTF32 : UnicodeCodec {
@inlinable // FIXME(sil-serialize-all)
public mutating func decode<I : IteratorProtocol>(
_ input: inout I
) -> UnicodeDecodingResult where I.Element == CodeUnit {
return UTF32._decode(&input)
}

@inlinable // FIXME(sil-serialize-all)
internal static func _decode<I : IteratorProtocol>(
_ input: inout I
) -> UnicodeDecodingResult where I.Element == CodeUnit {
var parser = ForwardParser()

Expand Down
73 changes: 0 additions & 73 deletions stdlib/public/core/UnicodeParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -57,79 +57,6 @@ public protocol _UnicodeParser {
where I.Element == Encoding.CodeUnit
}

extension _UnicodeParser {
@inlinable // FIXME(sil-serialize-all)
@inline(__always)
@discardableResult
internal static func _parse<I: IteratorProtocol>(
_ input: inout I,
repairingIllFormedSequences makeRepairs: Bool = true,
into output: (Encoding.EncodedScalar)->Void
) -> Int
where I.Element == Encoding.CodeUnit
{
var errorCount = 0
var d = Self()
while true {
switch d.parseScalar(from: &input) {
case let .valid(scalarContent):
output(scalarContent)
case .error:
if _slowPath(!makeRepairs) { return 1 }
errorCount += 1
output(Encoding.encodedReplacementCharacter)
case .emptyInput:
return errorCount
}
}
}

@inlinable // FIXME(sil-serialize-all)
@inline(__always)
@discardableResult
public static func _decode<I: IteratorProtocol>(
_ input: inout I,
repairingIllFormedSequences makeRepairs: Bool,
into output: (Unicode.Scalar)->Void
) -> Int
where I.Element == Encoding.CodeUnit
{
return _parse(&input, repairingIllFormedSequences: makeRepairs) {
output(Encoding.decode($0))
}
}
}

extension Unicode {
public typealias Parser = _UnicodeParser
}

extension Unicode {
@_fixed_layout
public // @testable
struct _ParsingIterator<
CodeUnitIterator : IteratorProtocol,
Parser: Unicode.Parser
> where Parser.Encoding.CodeUnit == CodeUnitIterator.Element {
@inline(__always)
@inlinable
public init(codeUnits: CodeUnitIterator, parser: Parser) {
self.codeUnits = codeUnits
self.parser = parser
}
public var codeUnits: CodeUnitIterator
public var parser: Parser
}
}

extension Unicode._ParsingIterator : IteratorProtocol, Sequence {
@inline(__always)
@inlinable
public mutating func next() -> Parser.Encoding.EncodedScalar? {
switch parser.parseScalar(from: &codeUnits) {
case let .valid(scalarContent): return scalarContent
case .error: return Parser.Encoding.encodedReplacementCharacter
case .emptyInput: return nil
}
}
}
73 changes: 73 additions & 0 deletions test/Prototypes/UnicodeDecoders.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,79 @@ extension Unicode.Scalar {
}
//===----------------------------------------------------------------------===//

extension Unicode {
@_fixed_layout
public // @testable
struct _ParsingIterator<
CodeUnitIterator : IteratorProtocol,
Parser: Unicode.Parser
> where Parser.Encoding.CodeUnit == CodeUnitIterator.Element {
@inline(__always)
@inlinable
public init(codeUnits: CodeUnitIterator, parser: Parser) {
self.codeUnits = codeUnits
self.parser = parser
}
public var codeUnits: CodeUnitIterator
public var parser: Parser
}
}

extension Unicode._ParsingIterator : IteratorProtocol, Sequence {
@inline(__always)
@inlinable
public mutating func next() -> Parser.Encoding.EncodedScalar? {
switch parser.parseScalar(from: &codeUnits) {
case let .valid(scalarContent): return scalarContent
case .error: return Parser.Encoding.encodedReplacementCharacter
case .emptyInput: return nil
}
}
}

extension _UnicodeParser {
@inlinable // FIXME(sil-serialize-all)
@inline(__always)
@discardableResult
internal static func _parse<I: IteratorProtocol>(
_ input: inout I,
repairingIllFormedSequences makeRepairs: Bool = true,
into output: (Encoding.EncodedScalar)->Void
) -> Int
where I.Element == Encoding.CodeUnit
{
var errorCount = 0
var d = Self()
while true {
switch d.parseScalar(from: &input) {
case let .valid(scalarContent):
output(scalarContent)
case .error:
if _slowPath(!makeRepairs) { return 1 }
errorCount += 1
output(Encoding.encodedReplacementCharacter)
case .emptyInput:
return errorCount
}
}
}

@inlinable // FIXME(sil-serialize-all)
@inline(__always)
@discardableResult
public static func _decode<I: IteratorProtocol>(
_ input: inout I,
repairingIllFormedSequences makeRepairs: Bool,
into output: (Unicode.Scalar)->Void
) -> Int
where I.Element == Encoding.CodeUnit
{
return _parse(&input, repairingIllFormedSequences: makeRepairs) {
output(Encoding.decode($0))
}
}
}

extension Unicode {
struct DefaultScalarView<
CodeUnits: BidirectionalCollection,
Expand Down
5 changes: 5 additions & 0 deletions test/api-digester/Outputs/stability-stdlib-abi.swift.expected
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,10 @@ Class _SharedStringStorage has removed conformance to _NSStringCore
Class _StringStorage has removed conformance to _NSStringCore
Protocol _NSStringCore has been removed

Func Unicode.UTF32._decode(_:) has been removed
Func _UnicodeParser._decode(_:repairingIllFormedSequences:into:) has been removed
Func _UnicodeParser._parse(_:repairingIllFormedSequences:into:) has been removed
Struct Unicode._ParsingIterator has been removed

Constructor ManagedBuffer.init(_doNotCallMe:) has been removed
Func _makeAnyHashableUpcastingToHashableBaseType(_:storingResultInto:) has been removed