Skip to content

[swift-3.0-preview-1-branch][stdlib] Fix the definition of nextUp and nextDown for floating point #2865

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 2 commits into from
Jun 3, 2016
Merged

[swift-3.0-preview-1-branch][stdlib] Fix the definition of nextUp and nextDown for floating point #2865

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da5bb7a
[stdlib] Add tests for FloatingPoint's nextUp and nextDown
natecook1000 May 31, 2016
8b2d201
[stdlib] Fix for nextUp and nextDown
natecook1000 May 31, 2016
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
8 changes: 4 additions & 4 deletions stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,25 +238,25 @@ public func expectOptionalEqual${Generic}(

%end

public func expectLT(_ lhs: Int, _ rhs: Int, ${TRACE}) {
public func expectLT<T : Comparable>(_ lhs: T, _ rhs: T, ${TRACE}) {
if !(lhs < rhs) {
expectationFailure("\(lhs) < \(rhs)", trace: ${trace})
}
}

public func expectLE(_ lhs: Int, _ rhs: Int, ${TRACE}) {
public func expectLE<T : Comparable>(_ lhs: T, _ rhs: T, ${TRACE}) {
if !(lhs <= rhs) {
expectationFailure("\(lhs) <= \(rhs)", trace: ${trace})
}
}

public func expectGT(_ lhs: Int, _ rhs: Int, ${TRACE}) {
public func expectGT<T : Comparable>(_ lhs: T, _ rhs: T, ${TRACE}) {
if !(lhs > rhs) {
expectationFailure("\(lhs) > \(rhs)", trace: ${trace})
}
}

public func expectGE(_ lhs: Int, _ rhs: Int, ${TRACE}) {
public func expectGE<T : Comparable>(_ lhs: T, _ rhs: T, ${TRACE}) {
if !(lhs >= rhs) {
expectationFailure("\(lhs) >= \(rhs)", trace: ${trace})
}
Expand Down
3 changes: 3 additions & 0 deletions stdlib/public/core/FloatingPointTypes.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,9 @@ extension ${Self}: BinaryFloatingPoint {
exponentBitPattern: exponentBitPattern - 1,
significandBitPattern: ${Self}._significandMask)
}
return ${Self}(sign: .minus,
exponentBitPattern: exponentBitPattern,
significandBitPattern: significandBitPattern - 1)
}
if isInfinite { return self }
if significandBitPattern == ${Self}._significandMask {
Expand Down
36 changes: 36 additions & 0 deletions test/1_stdlib/FloatingPoint.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,42 @@ FloatingPoint.test("Double/HashValueZero") {
expectEqual(zero.hashValue, negativeZero.hashValue)
}

let floatNextUpDownTests: [(Float, Float)] = [
(.nan, .nan),
(.greatestFiniteMagnitude, .infinity),
(-.infinity, -.greatestFiniteMagnitude),
(0x1.fffffep-1, 1.0), (1.0, 0x1.000002p+0),
(-0x1p-149, -0.0), (0.0, 0x1p-149),
(0x1.effffep-1, 0.96875), (0.96875, 0x1.f00002p-1),
]

FloatingPoint.test("Float.nextUp, .nextDown")
.forEach(in: floatNextUpDownTests) {
(prev, succ) in
expectEqual(succ.bitPattern, prev.nextUp.bitPattern)
expectEqual(prev.bitPattern, succ.nextDown.bitPattern)
expectEqual((-succ).bitPattern, (-prev).nextDown.bitPattern)
expectEqual((-prev).bitPattern, (-succ).nextUp.bitPattern)
}

let doubleNextUpDownTests: [(Double, Double)] = [
(.nan, .nan),
(.greatestFiniteMagnitude, .infinity),
(-.infinity, -.greatestFiniteMagnitude),
(0x1.fffffffffffffp-1, 1.0), (1.0, 0x1.0000000000001p+0),
(-0x1p-1074, -0.0), (0.0, 0x1p-1074),
(0x1.effffffffffffp-1, 0.96875), (0.96875, 0x1.f000000000001p-1),
]

FloatingPoint.test("Double.nextUp, .nextDown")
.forEach(in: doubleNextUpDownTests) {
(prev, succ) in
expectEqual(succ.bitPattern, prev.nextUp.bitPattern)
expectEqual(prev.bitPattern, succ.nextDown.bitPattern)
expectEqual((-succ).bitPattern, (-prev).nextDown.bitPattern)
expectEqual((-prev).bitPattern, (-succ).nextUp.bitPattern)
}

#if arch(i386) || arch(x86_64)

FloatingPoint.test("Float80/IntegerLiteralConvertible") {
Expand Down