Skip to content

Serialize floats with decimal point and don't assume Int if rounds #1443

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

Closed
wants to merge 1 commit into from
Closed

Serialize floats with decimal point and don't assume Int if rounds #1443

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
7 changes: 1 addition & 6 deletions Foundation/JSONSerialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ private struct JSONWriter {
let formatter: CFNumberFormatter
formatter = CFNumberFormatterCreate(nil, CFLocaleCopyCurrent(), kCFNumberFormatterNoStyle)
CFNumberFormatterSetProperty(formatter, kCFNumberFormatterMaxFractionDigits, NSNumber(value: 15))
CFNumberFormatterSetFormat(formatter, "0.###############"._cfObject)
CFNumberFormatterSetFormat(formatter, "0.0##############"._cfObject)
return formatter
}()

Expand Down Expand Up @@ -842,11 +842,6 @@ private struct JSONReader {
return nil
}

if doubleResult == doubleResult.rounded() {
return (shouldUseReferenceType ? NSNumber(value: Int(doubleResult)) : Int(doubleResult),
doubleDistance)
}

return (shouldUseReferenceType ? NSNumber(value: doubleResult) : doubleResult,
doubleDistance)
}
Expand Down
4 changes: 2 additions & 2 deletions TestFoundation/TestJSONSerialization.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1447,8 +1447,8 @@ extension TestJSONSerialization {
let data = decimalArray.data(using: String.Encoding.utf8)
let result = try JSONSerialization.jsonObject(with: data!, options: []) as? [Any]
XCTAssertEqual(result?[0] as! Double, 12.1)
XCTAssertEqual(result?[1] as! Int, 10)
XCTAssertEqual(result?[2] as! Int, 0)
XCTAssertEqual(result?[1] as! Double, 10.0)
XCTAssertEqual(result?[2] as! Double, 0.0)
XCTAssertEqual(result?[3] as! Double, 0.0001)
XCTAssertEqual(result?[4] as! Int, 20)
XCTAssertEqual(result?[5] as! Int, Int.max)
Expand Down