mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-01-04 20:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: #21541. Add support for xnVerbatimText (#21542)

Browse Source 
to text and text= procs. Remove unnecessary LF for xnVerbatimText
in $ proc.
This commit is contained in:
Mark Leyva
2023-03-20 10:50:58 -07:00
committed by GitHub
parent fb00b482eb
commit 285ea3c48e
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pure/xmltree.nim
View File

@@ -190,7 +190,7 @@ proc text*(n: XmlNode): lent string {.inline.} =
assert $c == "<!-- my comment -->"
assert c.text == "my comment"
n.expect {xnText, xnComment, xnCData, xnEntity}
n.expect {xnText, xnVerbatimText, xnComment, xnCData, xnEntity}
result = n.fText
proc `text=`*(n: XmlNode, text: sink string) {.inline.} =
@@ -208,7 +208,7 @@ proc `text=`*(n: XmlNode, text: sink string) {.inline.} =
e.text = "a new entity text"
assert $e == "&a new entity text;"
n.expect {xnText, xnComment, xnCData, xnEntity}
n.expect {xnText, xnVerbatimText, xnComment, xnCData, xnEntity}
n.fText = text
proc tag*(n: XmlNode): lent string {.inline.} =
@@ -735,7 +735,7 @@ proc addImpl(result: var string, n: XmlNode, indent = 0, indWidth = 2,
addNewLines = true, lastNodeIsText = false) =
proc noWhitespace(n: XmlNode): bool =
for i in 0 ..< n.len:
if n[i].kind in {xnText, xnEntity}: return true
if n[i].kind in {xnText, xnVerbatimText, xnEntity}: return true
proc addEscapedAttr(result: var string, s: string) =
# `addEscaped` alternative with less escaped characters.
@@ -784,7 +784,7 @@ proc addImpl(result: var string, n: XmlNode, indent = 0, indWidth = 2,
var lastNodeIsText = false
for i in 0 ..< n.len:
result.addImpl(n[i], indentNext, indWidth, addNewLines, lastNodeIsText)
lastNodeIsText = n[i].kind == xnText
lastNodeIsText = (n[i].kind == xnText) or (n[i].kind == xnVerbatimText)
if not n.noWhitespace():
result.addIndent(indent, addNewLines)

15
tests/stdlib/txmltree.nim
View File

@@ -99,3 +99,18 @@ block: # bug #21290
doAssert s == """<foo>
<bar>Hola<qux> <plugh /> </qux></bar>
</foo>"""
block: #21541
let root = <>root()
root.add <>child(newText("hello"))
root.add <>more(newVerbatimText("hola"))
let s = $root
doAssert s == """<root>
<child>hello</child>
<more>hola</more>
</root>"""
let temp = newVerbatimText("Hello!")
doAssert temp.text == "Hello!"
temp.text = "Hola!"
doAssert temp.text == "Hola!"