Skip to content

Commit 705aa96

Browse files
rintaroparkera
authored andcommitted
[NSGeometry] Use CGFloat.NativeType instead of hardcoded Double (#632)
1 parent f37bd60 commit 705aa96

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Foundation/NSGeometry.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -438,12 +438,12 @@ public func NSIntegralRectWithOptions(_ aRect: NSRect, _ opts: NSAlignmentOption
438438
NSUnimplemented()
439439
}
440440

441-
var width = Double.nan
442-
var height = Double.nan
443-
var minX = Double.nan
444-
var minY = Double.nan
445-
var maxX = Double.nan
446-
var maxY = Double.nan
441+
var width = CGFloat.NativeType.nan
442+
var height = CGFloat.NativeType.nan
443+
var minX = CGFloat.NativeType.nan
444+
var minY = CGFloat.NativeType.nan
445+
var maxX = CGFloat.NativeType.nan
446+
var maxY = CGFloat.NativeType.nan
447447

448448
if aRect.size.height.native < 0 {
449449
height = 0
@@ -532,10 +532,10 @@ public func NSIntegralRectWithOptions(_ aRect: NSRect, _ opts: NSAlignmentOption
532532
maxY = round(aRect.origin.y.native + aRect.size.height.native)
533533
}
534534

535-
var resultOriginX = Double.nan
536-
var resultOriginY = Double.nan
537-
var resultWidth = Double.nan
538-
var resultHeight = Double.nan
535+
var resultOriginX = CGFloat.NativeType.nan
536+
var resultOriginY = CGFloat.NativeType.nan
537+
var resultWidth = CGFloat.NativeType.nan
538+
var resultHeight = CGFloat.NativeType.nan
539539

540540
if !minX.isNaN {
541541
resultOriginX = minX

TestFoundation/TestNSGeometry.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ class TestNSGeometry : XCTestCase {
190190
let r2 = NSOffsetRect(r1, CGFloat(2.0), CGFloat(-5.0))
191191
let expectedRect = NSMakeRect(CGFloat(3.2), CGFloat(-1.9), CGFloat(10.0), CGFloat(10.0))
192192

193-
XCTAssertTrue(NSEqualRects(r2, expectedRect))
193+
XCTAssertTrue(_NSRect(expectedRect, equalsToRect: r2))
194194
}
195195

196196
func test_NSPointInRect() {
@@ -608,23 +608,23 @@ class TestNSGeometry : XCTestCase {
608608

609609
// MARK: Private
610610

611-
func _NSRect(_ rect: NSRect, equalsToRect rect2: NSRect, withPrecision precision: Double = DBL_EPSILON) -> Bool {
611+
func _NSRect(_ rect: NSRect, equalsToRect rect2: NSRect, withPrecision precision: CGFloat.NativeType = .ulpOfOne) -> Bool {
612612
return _NSPoint(rect.origin, equalsToPoint: rect2.origin, withPrecision: precision)
613613
&& _NSSize(rect.size, equalsToSize: rect2.size, withPrecision: precision)
614614
}
615615

616-
func _NSSize(_ size: NSSize, equalsToSize size2: NSSize, withPrecision precision: Double = DBL_EPSILON) -> Bool {
616+
func _NSSize(_ size: NSSize, equalsToSize size2: NSSize, withPrecision precision: CGFloat.NativeType = .ulpOfOne) -> Bool {
617617
return _CGFloat(size.width, equalsToCGFloat: size2.width, withPrecision: precision)
618618
&& _CGFloat(size.height, equalsToCGFloat: size2.height, withPrecision: precision)
619619
}
620620

621-
func _NSPoint(_ point: NSPoint, equalsToPoint point2: NSPoint, withPrecision precision: Double = DBL_EPSILON) -> Bool {
621+
func _NSPoint(_ point: NSPoint, equalsToPoint point2: NSPoint, withPrecision precision: CGFloat.NativeType = .ulpOfOne) -> Bool {
622622
return _CGFloat(point.x, equalsToCGFloat: point2.x, withPrecision: precision)
623623
&& _CGFloat(point.y, equalsToCGFloat: point2.y, withPrecision: precision)
624624
}
625625

626-
func _CGFloat(_ float: CGFloat, equalsToCGFloat float2: CGFloat, withPrecision precision: Double = DBL_EPSILON) -> Bool {
627-
return fabs(float.native - float2.native) < precision
626+
func _CGFloat(_ float: CGFloat, equalsToCGFloat float2: CGFloat, withPrecision precision: CGFloat.NativeType = .ulpOfOne) -> Bool {
627+
return fabs(float.native - float2.native) <= precision
628628
}
629629

630630
}

0 commit comments

Comments
 (0)