Skip to content

Commit 109912c

Browse files
committed
Check ignoreNamespaces on child element instead of parent
1 parent 730258f commit 109912c

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

SwiftyXMLParser/Accessor.swift

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,29 +128,26 @@ extension XML {
128128
let accessor: Accessor
129129
switch self {
130130
case .singleElement(let element):
131-
let filterdElements = element.childElements.filter {
132-
if element.ignoreNamespaces {
131+
let childElements = element.childElements.filter {
132+
if $0.ignoreNamespaces {
133133
return key == $0.name.components(separatedBy: ":").last ?? $0.name
134134
} else {
135135
return key == $0.name
136136
}
137137
}
138-
if filterdElements.isEmpty {
138+
if childElements.isEmpty {
139139
let error = accessError("\(key) not found.")
140-
accessor = Accessor(error)
141-
} else if filterdElements.count == 1 {
142-
accessor = Accessor(filterdElements[0])
140+
accessor = Accessor(error)
141+
} else if childElements.count == 1 {
142+
accessor = Accessor(childElements[0])
143143
} else {
144-
accessor = Accessor(filterdElements)
144+
accessor = Accessor(childElements)
145145
}
146146
case .failure(let error):
147-
accessor = Accessor(error)
148-
case .sequence(_):
149-
fallthrough
147+
accessor = Accessor(error)
150148
default:
151149
let error = accessError("cannot access \(key), because of multiple elements")
152-
accessor = Accessor(error)
153-
break
150+
accessor = Accessor(error)
154151
}
155152
return accessor
156153
}

0 commit comments

Comments
 (0)