Skip to content

NSNumber: Make comparing NaN with number match Darwin #2019

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
Mar 29, 2019
Merged

NSNumber: Make comparing NaN with number match Darwin #2019

Show file tree
Hide file tree
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
4 changes: 2 additions & 2 deletions Foundation/NSNumber.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -945,8 +945,8 @@ open class NSNumber : NSValue {
// Apply special handling for NaN as <, >, == always return false
// when comparing with NaN
if lhs.isNaN && rhs.isNaN { return .orderedSame }
if lhs.isNaN { return .orderedAscending }
if rhs.isNaN { return .orderedDescending }
if lhs.isNaN { return rhs < 0 ? .orderedDescending : .orderedAscending }
if rhs.isNaN { return lhs < 0 ? .orderedAscending : .orderedDescending }

if lhs < rhs { return .orderedAscending }
if lhs > rhs { return .orderedDescending }
Expand Down
87 changes: 73 additions & 14 deletions TestFoundation/TestNSNumber.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,19 @@ class TestNSNumber : XCTestCase {
XCTAssertEqual(NSNumber(value: Float(1)).doubleValue, Double(1))
XCTAssertEqual(NSNumber(value: Float(-37.5)).doubleValue, Double(-37.5))
XCTAssertEqual(NSNumber(value: Float(42.5)).doubleValue, Double(42.5))

let nanFloat = NSNumber(value: Float.nan)
XCTAssertTrue(nanFloat.doubleValue.isNaN)
XCTAssertEqual(nanFloat.intValue, Int(bitPattern: 1 << 63))
XCTAssertEqual(nanFloat.uintValue, UInt(bitPattern: 1 << 63))
XCTAssertEqual(nanFloat.int8Value, 0)
XCTAssertEqual(nanFloat.uint8Value, 0)
XCTAssertEqual(nanFloat.int16Value, 0)
XCTAssertEqual(nanFloat.uint16Value, 0)
XCTAssertEqual(nanFloat.int32Value, 0)
XCTAssertEqual(nanFloat.uint32Value, 0)
XCTAssertEqual(nanFloat.int64Value, Int64(bitPattern: 1 << 63))
XCTAssertEqual(nanFloat.uint64Value, UInt64(bitPattern: 1 << 63))
}

func test_numberWithDouble() {
Expand Down Expand Up @@ -885,6 +898,20 @@ class TestNSNumber : XCTestCase {
XCTAssertEqual(NSNumber(value: Double(0)).doubleValue, Double(0))
XCTAssertEqual(NSNumber(value: Double(-37.5)).doubleValue, Double(-37.5))
XCTAssertEqual(NSNumber(value: Double(42.1)).doubleValue, Double(42.1))

let nanDouble = NSNumber(value: Double.nan)
XCTAssertTrue(nanDouble.floatValue.isNaN)
XCTAssertEqual(nanDouble.intValue, Int(bitPattern: 1 << 63))
XCTAssertEqual(nanDouble.uintValue, UInt(bitPattern: 1 << 63))
XCTAssertEqual(nanDouble.int8Value, 0)
XCTAssertEqual(nanDouble.uint8Value, 0)
XCTAssertEqual(nanDouble.int16Value, 0)
XCTAssertEqual(nanDouble.uint16Value, 0)
XCTAssertEqual(nanDouble.int32Value, 0)
XCTAssertEqual(nanDouble.uint32Value, 0)
XCTAssertEqual(nanDouble.int64Value, Int64(bitPattern: 1 << 63))
XCTAssertEqual(nanDouble.uint64Value, UInt64(bitPattern: 1 << 63))

}

func test_compareNumberWithBool() {
Expand Down Expand Up @@ -1351,23 +1378,55 @@ class TestNSNumber : XCTestCase {
let num = NSNumber(value: Int8.min)
XCTAssertFalse(num == NSNumber(value: num.uint64Value))

let num1 = NSNumber(value: Float.nan)
XCTAssertEqual(num1.compare(num1), .orderedSame)
let zero = NSNumber(value: 0)
let one = NSNumber(value: 1)
let minusOne = NSNumber(value: -1)
let intMin = NSNumber(value: Int.min)
let intMax = NSNumber(value: Int.max)

let nanFloat = NSNumber(value: Float.nan)
XCTAssertEqual(nanFloat.compare(nanFloat), .orderedSame)

XCTAssertFalse(nanFloat == zero)
XCTAssertFalse(zero == nanFloat)
XCTAssertEqual(nanFloat.compare(zero), .orderedAscending)
XCTAssertEqual(zero.compare(nanFloat), .orderedDescending)

XCTAssertEqual(nanFloat.compare(one), .orderedAscending)
XCTAssertEqual(one.compare(nanFloat), .orderedDescending)

XCTAssertEqual(nanFloat.compare(intMax), .orderedAscending)
XCTAssertEqual(intMax.compare(nanFloat), .orderedDescending)

XCTAssertEqual(nanFloat.compare(minusOne), .orderedDescending)
XCTAssertEqual(minusOne.compare(nanFloat), .orderedAscending)

XCTAssertEqual(nanFloat.compare(intMin), .orderedDescending)
XCTAssertEqual(intMin.compare(nanFloat), .orderedAscending)


let nanDouble = NSNumber(value: Double.nan)
XCTAssertEqual(nanDouble.compare(nanDouble), .orderedSame)

XCTAssertFalse(nanDouble == zero)
XCTAssertFalse(zero == nanDouble)
XCTAssertEqual(nanDouble.compare(zero), .orderedAscending)
XCTAssertEqual(zero.compare(nanDouble), .orderedDescending)

XCTAssertEqual(nanDouble.compare(one), .orderedAscending)
XCTAssertEqual(one.compare(nanDouble), .orderedDescending)

XCTAssertEqual(nanDouble.compare(intMax), .orderedAscending)
XCTAssertEqual(intMax.compare(nanDouble), .orderedDescending)

let num2 = NSNumber(value: num1.uint8Value) // 0
XCTAssertFalse(num1 == num2)
XCTAssertFalse(num2 == num1)
XCTAssertEqual(num1.compare(num2), .orderedAscending)
XCTAssertEqual(num2.compare(num1), .orderedDescending)
XCTAssertEqual(nanDouble.compare(minusOne), .orderedDescending)
XCTAssertEqual(minusOne.compare(nanDouble), .orderedAscending)

let num3 = NSNumber(value: Double.nan)
XCTAssertEqual(num3.compare(num3), .orderedSame)
XCTAssertEqual(nanDouble.compare(intMin), .orderedDescending)
XCTAssertEqual(intMin.compare(nanDouble), .orderedAscending)

let num4 = NSNumber(value: num3.intValue) // 0
XCTAssertFalse(num3 == num2)
XCTAssertFalse(num4 == num3)
XCTAssertEqual(num3.compare(num4), .orderedAscending)
XCTAssertEqual(num4.compare(num3), .orderedDescending)
XCTAssertEqual(nanDouble, nanFloat)
XCTAssertEqual(nanFloat, nanDouble)

XCTAssertEqual(NSNumber(value: Double.leastNonzeroMagnitude).compare(NSNumber(value: 0)), .orderedDescending)
XCTAssertEqual(NSNumber(value: Double.greatestFiniteMagnitude).compare(NSNumber(value: 0)), .orderedDescending)
Expand Down