@@ -459,7 +459,7 @@ extension JSONEncoderImpl: _SpecialTreatmentEncoder {
459459 case let url as URL :
460460 return . string( url. absoluteString)
461461 case let decimal as Decimal :
462- return . number ( decimal. description)
462+ return . outputNumber ( decimal. description)
463463 case let object as [ String : Encodable ] : // this emits a warning, but it works perfectly
464464 return try self . wrapObject ( object, for: nil )
465465 case let date as Date :
@@ -507,7 +507,7 @@ extension _SpecialTreatmentEncoder {
507507 if string. hasSuffix ( " .0 " ) {
508508 string. removeLast ( 2 )
509509 }
510- return . number ( string)
510+ return . outputNumber ( string)
511511 }
512512
513513 fileprivate func wrapEncodable< E: Encodable > ( _ encodable: E , for additionalKey: CodingKey ? ) throws -> JSONValue ? {
@@ -519,7 +519,7 @@ extension _SpecialTreatmentEncoder {
519519 case let url as URL :
520520 return . string( url. absoluteString)
521521 case let decimal as Decimal :
522- return . number ( decimal. description)
522+ return . outputNumber ( decimal. description)
523523 case let object as [ String : Encodable ] :
524524 return try self . wrapObject ( object, for: additionalKey)
525525 default :
@@ -537,10 +537,10 @@ extension _SpecialTreatmentEncoder {
537537 return encoder. value ?? . null
538538
539539 case . secondsSince1970:
540- return . number ( date. timeIntervalSince1970. description)
540+ return . outputNumber ( date. timeIntervalSince1970. description)
541541
542542 case . millisecondsSince1970:
543- return . number ( ( date. timeIntervalSince1970 * 1000 ) . description)
543+ return . outputNumber ( ( date. timeIntervalSince1970 * 1000 ) . description)
544544
545545 case . iso8601:
546546 if #available( macOS 10 . 12 , iOS 10 . 0 , watchOS 3 . 0 , tvOS 10 . 0 , * ) {
@@ -751,7 +751,7 @@ extension JSONKeyedEncodingContainer {
751751 }
752752
753753 @inline ( __always) private mutating func encodeFixedWidthInteger< N: FixedWidthInteger > ( _ value: N , key: CodingKey ) throws {
754- self . object. set ( . number ( value. description) , for: key. stringValue)
754+ self . object. set ( . outputNumber ( value. description) , for: key. stringValue)
755755 }
756756}
757757
@@ -872,7 +872,7 @@ private struct JSONUnkeyedEncodingContainer: UnkeyedEncodingContainer, _SpecialT
872872
873873extension JSONUnkeyedEncodingContainer {
874874 @inline ( __always) private mutating func encodeFixedWidthInteger< N: FixedWidthInteger > ( _ value: N ) throws {
875- self . array. append ( . number ( value. description) )
875+ self . array. append ( . outputNumber ( value. description) )
876876 }
877877
878878 @inline ( __always) private mutating func encodeFloatingPoint< F: FloatingPoint & CustomStringConvertible > ( _ float: F ) throws {
@@ -971,7 +971,7 @@ private struct JSONSingleValueEncodingContainer: SingleValueEncodingContainer, _
971971extension JSONSingleValueEncodingContainer {
972972 @inline ( __always) private mutating func encodeFixedWidthInteger< N: FixedWidthInteger > ( _ value: N ) throws {
973973 self . preconditionCanEncodeNewValue ( )
974- self . impl. singleValue = . number ( value. description)
974+ self . impl. singleValue = . outputNumber ( value. description)
975975 }
976976
977977 @inline ( __always) private mutating func encodeFloatingPoint< F: FloatingPoint & CustomStringConvertible > ( _ float: F ) throws {
@@ -1011,7 +1011,9 @@ extension JSONValue {
10111011 bytes. append ( contentsOf: [ UInt8 ] . _false)
10121012 case . string( let string) :
10131013 self . encodeString ( string, to: & bytes)
1014- case . number( let string) :
1014+ case . inputNumber( let jsonNumber) :
1015+ bytes. append ( contentsOf: jsonNumber. description. utf8)
1016+ case . outputNumber( let string) :
10151017 bytes. append ( contentsOf: string. utf8)
10161018 case . array( let array) :
10171019 var iterator = array. makeIterator ( )
@@ -1070,7 +1072,9 @@ extension JSONValue {
10701072 bytes. append ( contentsOf: [ UInt8 ] . _false)
10711073 case . string( let string) :
10721074 self . encodeString ( string, to: & bytes)
1073- case . number( let string) :
1075+ case . inputNumber( let jsonNumber) :
1076+ bytes. append ( contentsOf: jsonNumber. description. utf8)
1077+ case . outputNumber( let string) :
10741078 bytes. append ( contentsOf: string. utf8)
10751079 case . array( let array) :
10761080 var iterator = array. makeIterator ( )
@@ -1529,14 +1533,14 @@ extension JSONDecoderImpl: Decoder {
15291533 }
15301534
15311535 private func unwrapDecimal( ) throws -> Decimal {
1532- guard case . number ( let numberString ) = self . json else {
1536+ guard case . inputNumber ( let jsonNumber ) = self . json else {
15331537 throw DecodingError . typeMismatch ( Decimal . self, DecodingError . Context ( codingPath: self . codingPath, debugDescription: " " ) )
15341538 }
15351539
1536- guard let decimal = Decimal ( string : numberString ) else {
1540+ guard let decimal = jsonNumber . exactlyDecimal else {
15371541 throw DecodingError . dataCorrupted ( . init(
15381542 codingPath: self . codingPath,
1539- debugDescription: " Parsed JSON number < \( numberString ) > does not fit in \( Decimal . self) . " ) )
1543+ debugDescription: " Parsed JSON number < \( jsonNumber ) > does not fit in \( Decimal . self) . " ) )
15401544 }
15411545
15421546 return decimal
@@ -1572,18 +1576,20 @@ extension JSONDecoderImpl: Decoder {
15721576 for additionalKey: CodingKey ? = nil ,
15731577 as type: T . Type ) throws -> T
15741578 {
1575- if case . number( let number) = value {
1576- guard let floatingPoint = T ( number) else {
1577- var path = self . codingPath
1578- if let additionalKey = additionalKey {
1579- path. append ( additionalKey)
1580- }
1581- throw DecodingError . dataCorrupted ( . init(
1582- codingPath: path,
1583- debugDescription: " Parsed JSON number < \( number) > does not fit in \( T . self) . " ) )
1579+ if case . inputNumber( let jsonNumber) = value {
1580+ if type == Double . self, let number = jsonNumber. exactlyDouble {
1581+ return number as! T
15841582 }
1585-
1586- return floatingPoint
1583+ if type == Float . self, let number = jsonNumber. exactlyFloat {
1584+ return number as! T
1585+ }
1586+ var path = self . codingPath
1587+ if let additionalKey = additionalKey {
1588+ path. append ( additionalKey)
1589+ }
1590+ throw DecodingError . dataCorrupted ( . init(
1591+ codingPath: path,
1592+ debugDescription: " Parsed JSON number < \( jsonNumber) > does not fit in \( T . self) . " ) )
15871593 }
15881594
15891595 if case . string( let string) = value,
@@ -1607,57 +1613,48 @@ extension JSONDecoderImpl: Decoder {
16071613 for additionalKey: CodingKey ? = nil ,
16081614 as type: T . Type ) throws -> T
16091615 {
1610- guard case . number ( let number ) = value else {
1616+ guard case . inputNumber ( let jsonNumber ) = value else {
16111617 throw self . createTypeMismatchError ( type: T . self, for: additionalKey, value: value)
16121618 }
16131619
1614- // this is the fast pass. Number directly convertible to Integer
1615- if let integer = T ( number) {
1616- return integer
1620+ if type == UInt8 . self, let number = jsonNumber. exactlyUInt8 {
1621+ return number as! T
16171622 }
1618-
1619- // this is the really slow path... If the fast path has failed. For example for "34.0" as
1620- // an integer, we try to go through NSNumber
1621- if let nsNumber = NSNumber . fromJSONNumber ( number) {
1622- if type == UInt8 . self, NSNumber ( value: nsNumber. uint8Value) == nsNumber {
1623- return nsNumber. uint8Value as! T
1624- }
1625- if type == Int8 . self, NSNumber ( value: nsNumber. int8Value) == nsNumber {
1626- return nsNumber. uint8Value as! T
1627- }
1628- if type == UInt16 . self, NSNumber ( value: nsNumber. uint16Value) == nsNumber {
1629- return nsNumber. uint16Value as! T
1630- }
1631- if type == Int16 . self, NSNumber ( value: nsNumber. int16Value) == nsNumber {
1632- return nsNumber. uint16Value as! T
1633- }
1634- if type == UInt32 . self, NSNumber ( value: nsNumber. uint32Value) == nsNumber {
1635- return nsNumber. uint32Value as! T
1636- }
1637- if type == Int32 . self, NSNumber ( value: nsNumber. int32Value) == nsNumber {
1638- return nsNumber. uint32Value as! T
1639- }
1640- if type == UInt64 . self, NSNumber ( value: nsNumber. uint64Value) == nsNumber {
1641- return nsNumber. uint64Value as! T
1642- }
1643- if type == Int64 . self, NSNumber ( value: nsNumber. int64Value) == nsNumber {
1644- return nsNumber. uint64Value as! T
1645- }
1646- if type == UInt . self, NSNumber ( value: nsNumber. uintValue) == nsNumber {
1647- return nsNumber. uintValue as! T
1648- }
1649- if type == Int . self, NSNumber ( value: nsNumber. uintValue) == nsNumber {
1650- return nsNumber. intValue as! T
1651- }
1623+ if type == Int8 . self, let number = jsonNumber. exactlyInt8 {
1624+ return number as! T
16521625 }
1653-
1626+ if type == UInt16 . self, let number = jsonNumber. exactlyUInt16 {
1627+ return number as! T
1628+ }
1629+ if type == Int16 . self, let number = jsonNumber. exactlyInt16 {
1630+ return number as! T
1631+ }
1632+ if type == UInt32 . self, let number = jsonNumber. exactlyUInt32 {
1633+ return number as! T
1634+ }
1635+ if type == Int32 . self, let number = jsonNumber. exactlyInt32 {
1636+ return number as! T
1637+ }
1638+ if type == UInt64 . self, let number = jsonNumber. exactlyUInt64 {
1639+ return number as! T
1640+ }
1641+ if type == Int64 . self, let number = jsonNumber. exactlyInt64 {
1642+ return number as! T
1643+ }
1644+ if type == UInt . self, let number = jsonNumber. exactlyUInt {
1645+ return number as! T
1646+ }
1647+ if type == Int . self, let number = jsonNumber. exactlyInt {
1648+ return number as! T
1649+ }
1650+
16541651 var path = self . codingPath
16551652 if let additionalKey = additionalKey {
16561653 path. append ( additionalKey)
16571654 }
16581655 throw DecodingError . dataCorrupted ( . init(
16591656 codingPath: path,
1660- debugDescription: " Parsed JSON number < \( number ) > does not fit in \( T . self) . " ) )
1657+ debugDescription: " Parsed JSON number < \( jsonNumber ) > does not fit in \( T . self) . " ) )
16611658 }
16621659
16631660 private func createTypeMismatchError( type: Any . Type , for additionalKey: CodingKey ? = nil , value: JSONValue ) -> DecodingError {
0 commit comments