jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #8329, allow case insensitive xmltree.findAll (#11305)

Browse source
This commit is contained in:
Miran 2019-05-23 00:14:28 +02:00 • committed by Andreas Rumpf
commit 44cc5f6360
1 changed files with 23 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

34
lib/pure/xmltree.nim
View file

@ -649,7 +649,7 @@ proc child*(n: XmlNode, name: string): XmlNode =
if i.tag == name: if i.tag == name:
return i return i
proc findAll*(n: XmlNode, tag: string, result: var seq[XmlNode]) = proc findAll*(n: XmlNode, tag: string, result: var seq[XmlNode], caseInsensitive = false) =
## Iterates over all the children of `n` returning those matching `tag`. ## Iterates over all the children of `n` returning those matching `tag`.
## ##
## Found nodes satisfying the condition will be appended to the `result` ## Found nodes satisfying the condition will be appended to the `result`
@ -658,8 +658,8 @@ proc findAll*(n: XmlNode, tag: string, result: var seq[XmlNode]) =
var var
b = newElement("good") b = newElement("good")
c = newElement("bad") c = newElement("bad")
d = newElement("bad") d = newElement("BAD")
e = newElement("good") e = newElement("GOOD")
b.add newText("b text") b.add newText("b text")
c.add newText("c text") c.add newText("c text")
d.add newText("d text") d.add newText("d text")
@ -667,34 +667,46 @@ proc findAll*(n: XmlNode, tag: string, result: var seq[XmlNode]) =
let a = newXmlTree("father", [b, c, d, e]) let a = newXmlTree("father", [b, c, d, e])
var s = newSeq[XmlNode]() var s = newSeq[XmlNode]()
a.findAll("good", s) a.findAll("good", s)
assert $s == "@[<good>b text</good>, <good>e text</good>]" assert $s == "@[<good>b text</good>]"
s.setLen(0)
a.findAll("good", s, caseInsensitive = true)
assert $s == "@[<good>b text</good>, <GOOD>e text</GOOD>]"
s.setLen(0)
a.findAll("BAD", s)
assert $s == "@[<BAD>d text</BAD>]"
s.setLen(0)
a.findAll("BAD", s, caseInsensitive = true)
assert $s == "@[<bad>c text</bad>, <BAD>d text</BAD>]"
assert n.k == xnElement assert n.k == xnElement
for child in n.items(): for child in n.items():
if child.k != xnElement: if child.k != xnElement:
continue continue
if child.tag == tag: if child.tag == tag or
(caseInsensitive and cmpIgnoreCase(child.tag, tag) == 0):
result.add(child) result.add(child)
child.findAll(tag, result) child.findAll(tag, result)
proc findAll*(n: XmlNode, tag: string): seq[XmlNode] = proc findAll*(n: XmlNode, tag: string, caseInsensitive = false): seq[XmlNode] =
## A shortcut version to assign in let blocks. ## A shortcut version to assign in let blocks.
runnableExamples: runnableExamples:
var var
b = newElement("good") b = newElement("good")
c = newElement("bad") c = newElement("bad")
d = newElement("bad") d = newElement("BAD")
e = newElement("good") e = newElement("GOOD")
b.add newText("b text") b.add newText("b text")
c.add newText("c text") c.add newText("c text")
d.add newText("d text") d.add newText("d text")
e.add newText("e text") e.add newText("e text")
let a = newXmlTree("father", [b, c, d, e]) let a = newXmlTree("father", [b, c, d, e])
assert $(a.findAll("good")) == "@[<good>b text</good>, <good>e text</good>]" assert $(a.findAll("good")) == "@[<good>b text</good>]"
assert $(a.findAll("bad")) == "@[<bad>c text</bad>, <bad>d text</bad>]" assert $(a.findAll("BAD")) == "@[<BAD>d text</BAD>]"
assert $(a.findAll("good", caseInsensitive = true)) == "@[<good>b text</good>, <GOOD>e text</GOOD>]"
assert $(a.findAll("BAD", caseInsensitive = true)) == "@[<bad>c text</bad>, <BAD>d text</BAD>]"
newSeq(result, 0) newSeq(result, 0)
findAll(n, tag, result) findAll(n, tag, result, caseInsensitive)
proc xmlConstructor(a: NimNode): NimNode {.compileTime.} = proc xmlConstructor(a: NimNode): NimNode {.compileTime.} =
if a.kind == nnkCall: if a.kind == nnkCall: