Skip to content

[stdlib] Address reviewer comments for consolidated integer-to-string conversion #14448

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.

Sign up for GitHub

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
Feb 7, 2018
Merged

[stdlib] Address reviewer comments for consolidated integer-to-string conversion #14448

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 6 additions & 8 deletions stdlib/public/core/Integers.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1687,9 +1687,7 @@ extension BinaryInteger {
@_inlineable // FIXME(sil-serialize-all)
@_versioned
@_transparent
internal func _description(
radix: Int = 10, uppercase: Bool = false
) -> String {
internal func _description(radix: Int, uppercase: Bool) -> String {
_precondition(2...36 ~= radix, "Radix must be between 2 and 36")

if bitWidth <= 64 {
Expand All @@ -1707,14 +1705,14 @@ extension BinaryInteger {
// (although not necessarily the case for builtin types).
let isRadixPowerOfTwo = radix.nonzeroBitCount == 1
let radix_ = Magnitude(radix)
let quotientAndRemainder: (Magnitude) -> (Magnitude, Magnitude) = { value in
func _quotientAndRemainder(_ value: Magnitude) -> (Magnitude, Magnitude) {
return isRadixPowerOfTwo
? (value >> radix.trailingZeroBitCount, value & (radix_ - 1))
: value.quotientAndRemainder(dividingBy: radix_)
}

let hasLetters = radix > 10
let ascii: (UInt8) -> UInt8 = { digit in
func _ascii(_ digit: UInt8) -> UInt8 {
let base: UInt8
if !hasLetters || digit < 10 {
base = UInt8(("0" as Unicode.Scalar).value)
Expand All @@ -1730,8 +1728,8 @@ extension BinaryInteger {
var value = magnitude
var result: [UInt8] = []
while value != 0 {
let (quotient, remainder) = quotientAndRemainder(value)
result.append(ascii(UInt8(truncatingIfNeeded: remainder)))
let (quotient, remainder) = _quotientAndRemainder(value)
result.append(_ascii(UInt8(truncatingIfNeeded: remainder)))
value = quotient
}

Expand All @@ -1745,7 +1743,7 @@ extension BinaryInteger {
/// A textual representation of this value.
@_inlineable // FIXME(sil-serialize-all)
public var description: String {
return _description()
return _description(radix: 10, uppercase: false)
}
}

Expand Down