Skip to content

Commit 314dfe0

Browse files
committed
stdlib: remove deprecated floating point APIs
1 parent 17036b4 commit 314dfe0

File tree

5 files changed

+30
-39
lines changed

5 files changed

+30
-39
lines changed

stdlib/public/SDK/CoreGraphics/CGFloat.swift.gyb

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ public struct CGFloat {
136136
return CGFloat(NativeType.signalingNaN)
137137
}
138138

139-
@available(*, deprecated, renamed: "nan")
139+
@available(*, unavailable, renamed: "nan")
140140
public static var quietNaN: CGFloat {
141-
return CGFloat(NativeType.nan)
141+
fatalError("unavailable")
142142
}
143143

144144
public static var greatestFiniteMagnitude: CGFloat {
@@ -269,9 +269,9 @@ public struct CGFloat {
269269
return native.isSignalingNaN
270270
}
271271

272-
@available(*, deprecated, renamed: "isSignalingNaN")
272+
@available(*, unavailable, renamed: "isSignalingNaN")
273273
public var isSignaling: Bool {
274-
return native.isSignalingNaN
274+
fatalError("unavailable")
275275
}
276276

277277
public var isCanonical: Bool {
@@ -302,33 +302,25 @@ public struct CGFloat {
302302
}
303303

304304
extension CGFloat {
305-
@available(*, deprecated, message: "use CGFloat.leastNormalMagnitude")
306-
@_transparent public static var min: CGFloat {
307-
#if arch(i386) || arch(arm)
308-
return CGFloat(FLT_MIN)
309-
#else
310-
return CGFloat(DBL_MIN)
311-
#endif
305+
@available(*, unavailable, renamed: "leastNormalMagnitude")
306+
public static var min: CGFloat {
307+
fatalError("unavailable")
312308
}
313309

314-
@available(*, deprecated, message: "use CGFloat.greatestFiniteMagnitude")
315-
@_transparent public static var max: CGFloat {
316-
#if arch(i386) || arch(arm)
317-
return CGFloat(FLT_MAX)
318-
#else
319-
return CGFloat(DBL_MAX)
320-
#endif
310+
@available(*, unavailable, renamed: "greatestFiniteMagnitude")
311+
public static var max: CGFloat {
312+
fatalError("unavailable")
321313
}
322314
}
323315

324-
@available(*, unavailable, message: "use CGFloat.leastNormalMagnitude")
316+
@available(*, unavailable, renamed: "CGFloat.leastNormalMagnitude")
325317
public var CGFLOAT_MIN: CGFloat {
326-
fatalError("can't retrieve unavailable property")
318+
fatalError("unavailable")
327319
}
328320

329-
@available(*, unavailable, message: "use CGFloat.greatestFiniteMagnitude")
321+
@available(*, unavailable, renamed: "CGFloat.greatestFiniteMagnitude")
330322
public var CGFLOAT_MAX: CGFloat {
331-
fatalError("can't retrieve unavailable property")
323+
fatalError("unavailable")
332324
}
333325

334326
extension CGFloat : CustomReflectable {
@@ -761,9 +753,9 @@ public func fmin(_ lhs: CGFloat, _ rhs: CGFloat) -> CGFloat {
761753

762754
@_transparent
763755
@warn_unused_result
764-
@available(*, deprecated, message: "use the floatingPointClass property.")
756+
@available(*, unavailable, message: "use the floatingPointClass property.")
765757
public func fpclassify(_ x: CGFloat) -> Int {
766-
return fpclassify(x.native)
758+
fatalError("unavailable")
767759
}
768760

769761
@available(*, unavailable, message: "use the isNormal property.")

stdlib/public/core/FloatingPoint.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ extension BinaryFloatingPoint {
813813
return true
814814
}
815815

816-
@available(*, deprecated, renamed: "isSignalingNaN")
816+
@available(*, unavailable, renamed: "isSignalingNaN")
817817
public var isSignaling: Bool {
818818
return isSignalingNaN
819819
}

stdlib/public/core/FloatingPointTypes.swift.gyb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ extension ${Self}: BinaryFloatingPoint {
207207
return FloatingPointSign(rawValue: Int(bitPattern >> ${RawSignificand}(shift)))!
208208
}
209209

210-
@available(*, deprecated, message: "Use the .sign property instead.")
211-
public var isSignMinus: Bool { return sign == .minus }
210+
@available(*, unavailable, renamed: "sign")
211+
public var isSignMinus: Bool { Builtin.unreachable() }
212212

213213
public var exponentBitPattern: UInt {
214214
return UInt(bitPattern >> UInt${bits}(${Self}.significandBitCount)) &
@@ -337,8 +337,8 @@ extension ${Self}: BinaryFloatingPoint {
337337
return ${Self}(nan: 0, signaling: true)
338338
}
339339

340-
@available(*, deprecated, renamed: "nan")
341-
public static var quietNaN: ${Self} { return nan }
340+
@available(*, unavailable, renamed: "nan")
341+
public static var quietNaN: ${Self} { Builtin.unreachable()}
342342

343343
public static var greatestFiniteMagnitude: ${Self} {
344344
return ${Self}(sign: .plus,

test/1_stdlib/Float.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,28 +167,28 @@ func checkInf(_ inf: TestFloat) {
167167
_precondition(!inf.isSubnormal)
168168
_precondition(inf.isInfinite)
169169
_precondition(!inf.isNaN)
170-
_precondition(!inf.isSignaling)
170+
_precondition(!inf.isSignalingNaN)
171171
}
172172

173173
func testInf() {
174174
var stdlibPlusInf = TestFloat.infinity
175175
checkInf(stdlibPlusInf)
176-
_precondition(!stdlibPlusInf.isSignMinus)
176+
_precondition(stdlibPlusInf.sign == .plus)
177177
_precondition(stdlibPlusInf.floatingPointClass == .positiveInfinity)
178178

179179
var stdlibMinusInf = -TestFloat.infinity
180180
checkInf(stdlibMinusInf)
181-
_precondition(stdlibMinusInf.isSignMinus)
181+
_precondition(stdlibMinusInf.sign == .minus)
182182
_precondition(stdlibMinusInf.floatingPointClass == .negativeInfinity)
183183

184184
var computedPlusInf = 1.0 / noinlinePlusZero()
185185
checkInf(computedPlusInf)
186-
_precondition(!computedPlusInf.isSignMinus)
186+
_precondition(computedPlusInf.sign == .plus)
187187
_precondition(computedPlusInf.floatingPointClass == .positiveInfinity)
188188

189189
var computedMinusInf = -1.0 / noinlinePlusZero()
190190
checkInf(computedMinusInf)
191-
_precondition(computedMinusInf.isSignMinus)
191+
_precondition(computedMinusInf.sign == .minus)
192192
_precondition(computedMinusInf.floatingPointClass == .negativeInfinity)
193193

194194
_precondition(stdlibPlusInf == computedPlusInf)
@@ -207,7 +207,7 @@ testInf()
207207
//===---
208208

209209
func checkNaN(_ nan: TestFloat) {
210-
_precondition(!nan.isSignMinus)
210+
_precondition(nan.sign == .plus)
211211
_precondition(!nan.isNormal)
212212
_precondition(!nan.isFinite)
213213
_precondition(!nan.isZero)
@@ -218,15 +218,15 @@ func checkNaN(_ nan: TestFloat) {
218218

219219
func checkQNaN(_ qnan: TestFloat) {
220220
checkNaN(qnan)
221-
_precondition(!qnan.isSignaling)
221+
_precondition(!qnan.isSignalingNaN)
222222
_precondition(qnan.floatingPointClass == .quietNaN)
223223
}
224224

225225
func checkSNaN(_ snan: TestFloat) {
226226
checkNaN(snan)
227227
// sNaN cannot be fully supported on i386.
228228
#if !arch(i386)
229-
_precondition(snan.isSignaling)
229+
_precondition(snan.isSignalingNaN)
230230
_precondition(snan.floatingPointClass == .signalingNaN)
231231
#endif
232232
}
@@ -235,7 +235,7 @@ func testNaN() {
235235
var stdlibDefaultNaN = TestFloat.nan
236236
checkQNaN(stdlibDefaultNaN)
237237

238-
var stdlibQNaN = TestFloat.quietNaN
238+
var stdlibQNaN = TestFloat.nan
239239
checkQNaN(stdlibQNaN)
240240

241241
var stdlibSNaN = TestFloat.signalingNaN

test/IDE/complete_literal.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
1.1.#^LITERAL2^#
1818
}
1919
// LITERAL2: Begin completions
20-
// LITERAL2-DAG: Decl[InstanceVar]/CurrNominal: isSignMinus[#Bool#]; name=isSignMinus{{$}}
2120
// LITERAL2-DAG: Decl[InstanceVar]/CurrNominal: isNormal[#Bool#]; name=isNormal{{$}}
2221
// LITERAL2-DAG: Decl[InstanceVar]/CurrNominal: isFinite[#Bool#]; name=isFinite{{$}}
2322
// LITERAL2-DAG: Decl[InstanceVar]/CurrNominal: isZero[#Bool#]; name=isZero{{$}}

0 commit comments

Comments
 (0)