Skip to content

Commit 091bdbe

Browse files
authored
update "Customize Parsing" examples (#294)
The examples didn't work with the latest version of the package.
1 parent 13f942e commit 091bdbe

File tree

1 file changed

+7
-18
lines changed

1 file changed

+7
-18
lines changed

Docs.md

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -82,16 +82,15 @@ import Yams
8282

8383
extension Constructor {
8484
public static func withBoolAsTrueFalse() -> Constructor {
85-
var map = defaultMap
85+
var map = defaultScalarMap
8686
map[.bool] = Bool.constructUsingOnlyTrueAndFalse
8787
return Constructor(map)
8888
}
8989
}
9090

9191
private extension Bool {
92-
static func constructUsingOnlyTrueAndFalse(from node: Node) -> Bool? {
93-
assert(node.isScalar)
94-
switch node.scalar!.string.lowercased() {
92+
static func constructUsingOnlyTrueAndFalse(from scalar: Node.Scalar) -> Bool? {
93+
switch scalar.string.lowercased() {
9594
case "true":
9695
return true
9796
case "false":
@@ -102,15 +101,6 @@ private extension Bool {
102101
}
103102
}
104103

105-
private extension Node {
106-
var isScalar: Bool {
107-
if case .scalar = self {
108-
return true
109-
}
110-
return false
111-
}
112-
}
113-
114104
// Usage:
115105

116106
let yamlString = """
@@ -136,17 +126,16 @@ import Yams
136126

137127
extension Constructor {
138128
public static func withEnv(_ env: [String: String]) -> Constructor {
139-
var map = defaultMap
129+
var map = defaultScalarMap
140130
map[.str] = String.constructExpandingEnvVars(env: env)
141131
return Constructor(map)
142132
}
143133
}
144134

145135
private extension String {
146-
static func constructExpandingEnvVars(env: [String: String]) -> (_ node: Node) -> String? {
147-
return { (node: Node) -> String? in
148-
assert(node.isScalar)
149-
return node.scalar!.string.expandingEnvVars(env: env)
136+
static func constructExpandingEnvVars(env: [String: String]) -> (_ scalar: Node.Scalar) -> String? {
137+
return { (scalar: Node.Scalar) -> String? in
138+
return node.string.expandingEnvVars(env: env)
150139
}
151140
}
152141

0 commit comments

Comments
 (0)