Add Codable conformance to common Foundation types #9632
Conversation
|
@swift-ci Please smoke test |
| @@ -276,7 +283,7 @@ fileprivate struct _PlistKeyedEncodingContainer<K : CodingKey> : KeyedEncodingCo | |||
| } | |||
|
|
|||
| mutating func nestedUnkeyedContainer(forKey key: Key) -> UnkeyedEncodingContainer { | |||
| let array = self.encoder.storage.pushUnkeyedContainer() | |||
| let array = NSMutableArray() | |||
There was a problem hiding this comment.
This was the cause of a bug where requesting a nested unkeyed container inside a top-level keyed container would return an empty array for the encoded object.
itaiferber
force-pushed
the
foundation-codable-conformances
branch
from
f6ece07 to
682b219
Compare
|
@swift-ci Please smoke test and merge |
itaiferber
force-pushed
the
foundation-codable-conformances
branch
from
682b219 to
353d159
Compare
|
@swift-ci Please smoke test and merge |
| @_transparent | ||
| public init(from decoder: Decoder) throws { | ||
| let container = try decoder.singleValueContainer() | ||
| self.native = try container.decode(NativeType.self) |
There was a problem hiding this comment.
Doesn't this mean that archives with CGFloat in them are nonportable? Is that acceptable?
There was a problem hiding this comment.
Potentially, yes, though we face a similar portability issue with Int... One thing we can do is always encode as a Double and simply fail on 32-bit platforms if the decoded Double does not fit in a Float. This doesn't change anything about the failure, but may play more nicely with fixed-width format Encoders and Decoders which may prevent you from decoding a Double if you encoded a Float, or vice versa (i.e. we push the failure out from Decoder code into CGFloat code, which we control, and can provide an error message). @parkera Thoughts?
There was a problem hiding this comment.
Another thing we can do is attempt to decode NativeType.self, and if that fails with DecodingError.typeMismatch, attempt the other type. If that fails as well, then it's neither a Float nor a Double.
I think this is a reasonable middle ground.
There was a problem hiding this comment.
Yeah, that seems like a reasonable middle ground. I guess I was assuming that the Int case would be okay because Encoders and Decoders need to natively handle Int already, but that's not true for CGFloat.
|
Let's try this again. |
|
@swift-ci Please smoke test |
|
@jrose-apple Any idea what's causing |
|
#9663 may fix this; waiting for merge on that. |
|
Sorry for the trouble! |
|
@jrose-apple No worries 😄 |
itaiferber
force-pushed
the
foundation-codable-conformances
branch
from
353d159 to
116c3f9
Compare
Add conformances + unit tests for * CGFloat * AffineTransform * Calendar * CharacterSet * DateComponents * DateInterval * Decimal * IndexPath * IndexSet * Locale * Measurement * NSRange * PersonNameComponents * TimeZone * URL * UUID along with some unit tests for each.
itaiferber
force-pushed
the
foundation-codable-conformances
branch
from
116c3f9 to
dee889f
Compare
|
@swift-ci Please smoke test and merge |
What's in this pull request
Add conformances + unit tests for
along with some unit tests for each.
Resolves SR-4789 and SR-4790.