From 764fc0aa133d24945f6c0a774cbb992c04a15d64 Mon Sep 17 00:00:00 2001 From: Max Moiseev Date: Fri, 13 Jan 2017 18:22:18 -0800 Subject: [PATCH 1/3] Replacing M_PI with .pi --- stdlib/public/SDK/Foundation/AffineTransform.swift | 4 ++-- test/stdlib/TestAffineTransform.swift | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/stdlib/public/SDK/Foundation/AffineTransform.swift b/stdlib/public/SDK/Foundation/AffineTransform.swift index 82ef2f7a2541a..a3a2c67d23a0e 100644 --- a/stdlib/public/SDK/Foundation/AffineTransform.swift +++ b/stdlib/public/SDK/Foundation/AffineTransform.swift @@ -124,7 +124,7 @@ public struct AffineTransform : ReferenceConvertible, Hashable, CustomStringConv [ 0 0 1 ] */ public init(rotationByDegrees angle: CGFloat) { - let α = Double(angle) * M_PI / 180.0 + let α = Double(angle) * .pi / 180.0 self.init(rotationByRadians: CGFloat(α)) } @@ -153,7 +153,7 @@ public struct AffineTransform : ReferenceConvertible, Hashable, CustomStringConv [ 0 0 1 ] */ public mutating func rotate(byDegrees angle: CGFloat) { - let α = Double(angle) * M_PI / 180.0 + let α = Double(angle) * .pi / 180.0 return rotate(byRadians: CGFloat(α)) } diff --git a/test/stdlib/TestAffineTransform.swift b/test/stdlib/TestAffineTransform.swift index 29ba030716078..19616521c8c49 100644 --- a/test/stdlib/TestAffineTransform.swift +++ b/test/stdlib/TestAffineTransform.swift @@ -169,19 +169,19 @@ class TestAffineTransform : TestAffineTransformSuper { checkPointTransformation(noop, point: point, expectedPoint: point) var tenEighty = AffineTransform.identity - tenEighty.rotate(byRadians: CGFloat(6 * M_PI)) + tenEighty.rotate(byRadians: CGFloat(6 * .pi)) checkPointTransformation(tenEighty, point: point, expectedPoint: point) var rotateCounterClockwise = AffineTransform.identity - rotateCounterClockwise.rotate(byRadians: CGFloat(M_PI_2)) + rotateCounterClockwise.rotate(byRadians: CGFloat(Double.pi / 2)) checkPointTransformation(rotateCounterClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(10.0))) var rotateClockwise = AffineTransform.identity - rotateClockwise.rotate(byRadians: CGFloat(-M_PI_2)) + rotateClockwise.rotate(byRadians: CGFloat(-Double.pi / 2)) checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(10.0), y: CGFloat(-10.0))) var reflectAboutOrigin = AffineTransform.identity - reflectAboutOrigin.rotate(byRadians: CGFloat(M_PI)) + reflectAboutOrigin.rotate(byRadians: CGFloat(.pi)) checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(-10.0))) } From b8a722ee99556e004da55efc538d16d84a5bf86f Mon Sep 17 00:00:00 2001 From: Max Moiseev Date: Fri, 13 Jan 2017 19:42:29 -0800 Subject: [PATCH 2/3] Fixing the AffineTransform test --- test/stdlib/TestAffineTransform.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/stdlib/TestAffineTransform.swift b/test/stdlib/TestAffineTransform.swift index 19616521c8c49..0c8cca0b3a251 100644 --- a/test/stdlib/TestAffineTransform.swift +++ b/test/stdlib/TestAffineTransform.swift @@ -169,7 +169,7 @@ class TestAffineTransform : TestAffineTransformSuper { checkPointTransformation(noop, point: point, expectedPoint: point) var tenEighty = AffineTransform.identity - tenEighty.rotate(byRadians: CGFloat(6 * .pi)) + tenEighty.rotate(byRadians: CGFloat(6 * Double.pi)) checkPointTransformation(tenEighty, point: point, expectedPoint: point) var rotateCounterClockwise = AffineTransform.identity @@ -181,7 +181,7 @@ class TestAffineTransform : TestAffineTransformSuper { checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(10.0), y: CGFloat(-10.0))) var reflectAboutOrigin = AffineTransform.identity - reflectAboutOrigin.rotate(byRadians: CGFloat(.pi)) + reflectAboutOrigin.rotate(byRadians: CGFloat(Double.pi)) checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(-10.0))) } From b2efca54d6d872d7b7008ecc47d6c6d0a1910c53 Mon Sep 17 00:00:00 2001 From: Max Moiseev Date: Tue, 17 Jan 2017 11:29:50 -0800 Subject: [PATCH 3/3] Removing unnecessary CGFloat->Double->CGFloat conversions --- stdlib/public/SDK/Foundation/AffineTransform.swift | 8 ++++---- test/stdlib/TestAffineTransform.swift | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/stdlib/public/SDK/Foundation/AffineTransform.swift b/stdlib/public/SDK/Foundation/AffineTransform.swift index a3a2c67d23a0e..34925d058fa1a 100644 --- a/stdlib/public/SDK/Foundation/AffineTransform.swift +++ b/stdlib/public/SDK/Foundation/AffineTransform.swift @@ -124,8 +124,8 @@ public struct AffineTransform : ReferenceConvertible, Hashable, CustomStringConv [ 0 0 1 ] */ public init(rotationByDegrees angle: CGFloat) { - let α = Double(angle) * .pi / 180.0 - self.init(rotationByRadians: CGFloat(α)) + let α = angle * .pi / 180.0 + self.init(rotationByRadians: α) } /** @@ -153,8 +153,8 @@ public struct AffineTransform : ReferenceConvertible, Hashable, CustomStringConv [ 0 0 1 ] */ public mutating func rotate(byDegrees angle: CGFloat) { - let α = Double(angle) * .pi / 180.0 - return rotate(byRadians: CGFloat(α)) + let α = angle * .pi / 180.0 + return rotate(byRadians: α) } /** diff --git a/test/stdlib/TestAffineTransform.swift b/test/stdlib/TestAffineTransform.swift index 0c8cca0b3a251..041a5322eee3e 100644 --- a/test/stdlib/TestAffineTransform.swift +++ b/test/stdlib/TestAffineTransform.swift @@ -169,19 +169,19 @@ class TestAffineTransform : TestAffineTransformSuper { checkPointTransformation(noop, point: point, expectedPoint: point) var tenEighty = AffineTransform.identity - tenEighty.rotate(byRadians: CGFloat(6 * Double.pi)) + tenEighty.rotate(byRadians: 6 * .pi) checkPointTransformation(tenEighty, point: point, expectedPoint: point) var rotateCounterClockwise = AffineTransform.identity - rotateCounterClockwise.rotate(byRadians: CGFloat(Double.pi / 2)) + rotateCounterClockwise.rotate(byRadians: .pi / 2) checkPointTransformation(rotateCounterClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(10.0))) var rotateClockwise = AffineTransform.identity - rotateClockwise.rotate(byRadians: CGFloat(-Double.pi / 2)) + rotateClockwise.rotate(byRadians: -.pi / 2) checkPointTransformation(rotateClockwise, point: point, expectedPoint: NSPoint(x: CGFloat(10.0), y: CGFloat(-10.0))) var reflectAboutOrigin = AffineTransform.identity - reflectAboutOrigin.rotate(byRadians: CGFloat(Double.pi)) + reflectAboutOrigin.rotate(byRadians: .pi) checkPointTransformation(reflectAboutOrigin, point: point, expectedPoint: NSPoint(x: CGFloat(-10.0), y: CGFloat(-10.0))) }