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

Merge branch 'patch-2' of https://github.com/rgv151/Nim into rgv151-patch-2

Browse source 
Conflicts:
	lib/pure/htmlparser.nim
This commit is contained in:
Dominik Picheta 2015-06-20 11:36:59 +01:00
commit 89727ef207
1 changed files with 50 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/pure/htmlparser.nim
View file

@ -423,6 +423,7 @@ proc toHtmlTag(s: string): HtmlTag =
of "wbr": tagWbr of "wbr": tagWbr
else: tagUnknown else: tagUnknown
proc htmlTag*(n: XmlNode): HtmlTag = proc htmlTag*(n: XmlNode): HtmlTag =
## gets `n`'s tag as a ``HtmlTag``. ## gets `n`'s tag as a ``HtmlTag``.
if n.clientData == 0: if n.clientData == 0:
@ -469,7 +470,7 @@ proc untilElementEnd(x: var XmlParser, result: XmlNode,
tagOption}: tagOption}:
errors.add(expected(x, result)) errors.add(expected(x, result))
break break
of tagTd, tagTh, tagTfoot, tagThead: of tagTd, tagTh:
if htmlTag(x.elemName) in {tagTr, tagTd, tagTh, tagTfoot, tagThead}: if htmlTag(x.elemName) in {tagTr, tagTd, tagTh, tagTfoot, tagThead}:
errors.add(expected(x, result)) errors.add(expected(x, result))
break break