File tree Expand file tree Collapse file tree 1 file changed +7
-18
lines changed Expand file tree Collapse file tree 1 file changed +7
-18
lines changed Original file line number Diff line number Diff line change @@ -82,16 +82,15 @@ import Yams
82
82
83
83
extension Constructor {
84
84
public static func withBoolAsTrueFalse () -> Constructor {
85
- var map = defaultMap
85
+ var map = defaultScalarMap
86
86
map[.bool ] = Bool .constructUsingOnlyTrueAndFalse
87
87
return Constructor (map)
88
88
}
89
89
}
90
90
91
91
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 () {
95
94
case " true" :
96
95
return true
97
96
case " false" :
@@ -102,15 +101,6 @@ private extension Bool {
102
101
}
103
102
}
104
103
105
- private extension Node {
106
- var isScalar: Bool {
107
- if case .scalar = self {
108
- return true
109
- }
110
- return false
111
- }
112
- }
113
-
114
104
// Usage:
115
105
116
106
let yamlString = """
@@ -136,17 +126,16 @@ import Yams
136
126
137
127
extension Constructor {
138
128
public static func withEnv (_ env : [String : String ]) -> Constructor {
139
- var map = defaultMap
129
+ var map = defaultScalarMap
140
130
map[.str ] = String .constructExpandingEnvVars (env : env)
141
131
return Constructor (map)
142
132
}
143
133
}
144
134
145
135
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)
150
139
}
151
140
}
152
141
You can’t perform that action at this time.
0 commit comments