Skip to content

Commit e5aa1a8

Browse files
committed
Change func 'inf()' to 'infinite()' to match 'isInfinite'.
Swift SVN r18309
1 parent 4352c71 commit e5aa1a8

5 files changed

+13
-13
lines changed

stdlib/core/FloatingPoint.swift.gyb

+2-2
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ extension ${Self} : FloatingPointNumber {
181181
return _toBitPattern() & mask
182182
}
183183

184-
static func inf() -> ${Self} {
184+
static func infinite() -> ${Self} {
185185
return _fromBitPattern(${getInfBitPattern(bits)})
186186
}
187187

@@ -235,7 +235,7 @@ extension ${Self} : FloatingPointNumber {
235235
return false
236236

237237
// Alternative implementation that is not safe in case of SNaN:
238-
// return abs(self) == ${Self}.inf()
238+
// return abs(self) == ${Self}.infinite()
239239
}
240240

241241
var isNaN: Bool {

stdlib/core/FloatingPointOperations.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protocol FloatingPointNumber {
5353
// FIXME: make these readonly static properties.
5454

5555
/// Returns positive infinity.
56-
class func inf() -> Self
56+
class func infinite() -> Self
5757

5858
/// Returns a quiet NaN.
5959
class func NaN() -> Self

test/stdlib/Float.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,12 @@ func checkInf(inf: TestFloat) {
168168
}
169169

170170
func testInf() {
171-
var stdlibPlusInf = TestFloat.inf()
171+
var stdlibPlusInf = TestFloat.infinite()
172172
checkInf(stdlibPlusInf)
173173
_precondition(!stdlibPlusInf.isSignMinus)
174174
_precondition(stdlibPlusInf.floatingPointClass == .PositiveInfinity)
175175

176-
var stdlibMinusInf = -TestFloat.inf()
176+
var stdlibMinusInf = -TestFloat.infinite()
177177
checkInf(stdlibMinusInf)
178178
_precondition(stdlibMinusInf.isSignMinus)
179179
_precondition(stdlibMinusInf.floatingPointClass == .NegativeInfinity)

test/stdlib/FloatingPointConversionOverflow.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ import Darwin
4141
// Interpret the command line arguments.
4242
let arg = Process.arguments[1]
4343

44-
let pd = +Double.inf()
45-
let nd = -Double.inf()
46-
let pf = +Float.inf()
47-
let nf = -Float.inf()
44+
let pd = +Double.infinite()
45+
let nd = -Double.infinite()
46+
let pf = +Float.infinite()
47+
let nf = -Float.infinite()
4848

4949
println("GOOD") // CHECK: GOOD
5050

test/stdlib/Print.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,17 @@ test_IntegerPrinting()
213213
// CHECK: test_IntegerPrinting done
214214

215215
func test_FloatingPointPrinting() {
216-
printedIs(Float.inf(), "inf")
217-
printedIs(-Float.inf(), "-inf")
216+
printedIs(Float.infinite(), "inf")
217+
printedIs(-Float.infinite(), "-inf")
218218
printedIs(Float.NaN(), "nan")
219219
printedIs(Float(0.0), "0.0")
220220
printedIs(Float(1.0), "1.0")
221221
printedIs(Float(-1.0), "-1.0")
222222
printedIs(Float(100.125), "100.125")
223223
printedIs(Float(-100.125), "-100.125")
224224

225-
printedIs(Double.inf(), "inf")
226-
printedIs(-Double.inf(), "-inf")
225+
printedIs(Double.infinite(), "inf")
226+
printedIs(-Double.infinite(), "-inf")
227227
printedIs(Double.NaN(), "nan")
228228
printedIs(Double(0.0), "0.0")
229229
printedIs(Double(1.0), "1.0")

0 commit comments

Comments
 (0)