Skip to content
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

Jump to bottom

Fix encoding with pattern matching #9

Merged
merged 13 commits into from
Jul 14, 2019
Merged

Fix encoding with pattern matching #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b70ef0a
Run swiftformat
bwetherfield Jul 13, 2019
d19fd94
Remove prints
bwetherfield Jul 13, 2019
cc4b7cc
Remove xcscheme
bwetherfield Jul 13, 2019
fe7893c
Merge remote-tracking branch 'jsbean/bean/decoding-enums' into wether…
bwetherfield Jul 13, 2019
717f56c
Add concrete decoding tests
bwetherfield Jul 13, 2019
315583b
Fix formatting
bwetherfield Jul 13, 2019
0e459b1
Remove type(of:) definitions
bwetherfield Jul 13, 2019
d26a698
Merge remote-tracking branch 'jsbean/bean/decoding-enums' into wether…
bwetherfield Jul 13, 2019
f0e1d04
Fix roundtrip test
bwetherfield Jul 14, 2019
e57b271
Add pattern matching to encoding step
bwetherfield Jul 14, 2019
85dcf97
Improve patternmatching syntax
bwetherfield Jul 14, 2019
a9e4a27
Fix formatting
bwetherfield Jul 14, 2019
d81bce7
Merge branch 'bean/decoding-enums' into fix-just-encoding
bwetherfield Jul 14, 2019
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
6 changes: 5 additions & 1 deletion Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,11 @@ struct XMLCoderElement: Equatable {
extension XMLCoderElement {
init(key: String, box: UnkeyedBox) {
self.init(key: key, elements: box.map {
XMLCoderElement(key: "", box: $0)
if $0 is KeyedBox {
return XMLCoderElement(key: "", box: $0)
} else {
return XMLCoderElement(key: key, box: $0)
}
})
}

Expand Down
5 changes: 2 additions & 3 deletions Tests/XMLCoderTests/EnumAssociatedValueTestSimple.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ private enum IntOrString {
}

extension IntOrString: Codable {

enum CodingKeys: String, CodingKey {
case int
case string
Expand All @@ -23,9 +22,9 @@ extension IntOrString: Codable {
func encode(to encoder: Encoder) throws {
var container = encoder.container(keyedBy: CodingKeys.self)
switch self {
case .int(let value):
case let .int(value):
try container.encode(value, forKey: .int)
case .string(let value):
case let .string(value):
try container.encode(value, forKey: .string)
}
}
Expand Down