Skip to content

Commit 78c1765

Browse files
committed
Merge pull request #168 from CodaFi/killvarsa
Rebind variable declarations in JSON example
2 parents 65c9c4d + c620093 commit 78c1765

File tree

2 files changed

+8
-16
lines changed

2 files changed

+8
-16
lines changed

README.md

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -105,16 +105,12 @@ final class User: JSONDecode {
105105
}
106106

107107
public class func fromJSON(x : JSONValue) -> User? {
108-
var n: String?
109-
var a: Int?
110-
var t: [String]?
111-
var r: Dictionary<String, String>?
112108
switch x {
113109
case let .JSONObject(d):
114-
n = d["name"] >>- JString.fromJSON
115-
a = d["age"] >>- JInt.fromJSON
116-
t = d["tweets"] >>- JArray<String, JString>.fromJSON
117-
r = d["attrs"] >>- JDictionary<String, JString>.fromJSON
110+
let n = d["name"] >>- JString.fromJSON
111+
let a = d["age"] >>- JInt.fromJSON
112+
let t = d["tweets"] >>- JArray<String, JString>.fromJSON
113+
let r = d["attrs"] >>- JDictionary<String, JString>.fromJSON
118114
// alternatively, if n && a && t... { return User(n!, a!, ...
119115
return (User.create <^> n <*> a <*> t <*> r)
120116
default:

SwiftzTests/UserExample.swift

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@ public class User: JSONDecode {
3030
}
3131

3232
public class func fromJSON(x: JSONValue) -> User? {
33-
var n: String?
34-
var a: Int?
35-
var t: [String]?
36-
var r: Dictionary<String, String>?
3733
switch x {
3834
case let .JSONObject(d):
39-
n = d["name"] >>- JString.fromJSON
40-
a = d["age"] >>- JInt.fromJSON
41-
t = d["tweets"] >>- JArray<String, JString>.fromJSON
42-
r = d["attrs"] >>- JDictionary<String, JString>.fromJSON
35+
let n = d["name"] >>- JString.fromJSON
36+
let a = d["age"] >>- JInt.fromJSON
37+
let t = d["tweets"] >>- JArray<String, JString>.fromJSON
38+
let r = d["attrs"] >>- JDictionary<String, JString>.fromJSON
4339
// alternatively, if n && a && t... { return User(n!, a!, ...
4440
return (User.create <^> n <*> a <*> t <*> r)
4541
default:

0 commit comments

Comments
 (0)