Add parsing empty attribs to htmlparser (#9559)

This commit is contained in:
rec 2018-10-30 06:58:39 +01:00 • committed by Andreas Rumpf
commit 9899c4525c
3 changed files with 23 additions and 3 deletions

View file

@ -2014,7 +2014,8 @@ proc parseHtml*(s: Stream, filename: string,
## Parses the XML from stream `s` and returns a ``XmlNode``. Every
## occurred parsing error is added to the `errors` sequence.
var x: XmlParser
open(x, s, filename, {reportComments, reportWhitespace, allowUnquotedAttribs})
open(x, s, filename, {reportComments, reportWhitespace, allowUnquotedAttribs,
allowEmptyAttribs})
next(x)
# skip the DOCTYPE:
if x.kind == xmlSpecial: next(x)

View file

@ -189,6 +189,7 @@ type
reportWhitespace, ## report whitespace
reportComments ## report comments
allowUnquotedAttribs ## allow unquoted attribute values (for HTML)
allowEmptyAttribs ## allow empty attributes (without explicit value)
XmlParser* = object of BaseLexer ## the parser object.
a, b, c: string
@ -621,10 +622,15 @@ proc parseAttribute(my: var XmlParser) =
if my.a.len == 0:
markError(my, errGtExpected)
return
let startPos = my.bufpos
parseWhitespace(my, skip=true)
if my.buf[my.bufpos] != '=':
markError(my, errEqExpected)
if allowEmptyAttribs notin my.options or
(my.buf[my.bufpos] != '>' and my.bufpos == startPos):
markError(my, errEqExpected)
return
inc(my.bufpos)
parseWhitespace(my, skip=true)