parse_declaration(): be more lenient in what we accept. We now

basically accept <!...> where the dots can be single- or double-quoted
strings or any other character except >.

Background: I found a real-life example that failed to parse with
the old assumption: http://www.opensource.org/licenses/jabberpl.html
contains a few constructs of the form <![if !supportLists]>...<![endif]>.
This commit is contained in:
Guido van Rossum 2001-05-21 20:17:17 +00:00
parent 2b63969a5a
commit 39d345127e
1 changed files with 7 additions and 12 deletions

View File

@ -39,7 +39,7 @@ attrfind = re.compile(
r'\s*([a-zA-Z_][-.a-zA-Z_0-9]*)(\s*=\s*'
r'(\'[^\']*\'|"[^"]*"|[-a-zA-Z0-9./:;+*%?!&$\(\)_#=~]*))?')
declname = re.compile(r'[a-zA-Z][-_.a-zA-Z0-9]*\s*')
decldata = re.compile(r'[^>\'\"]+')
declstringlit = re.compile(r'(\'[^\']*\'|"[^"]*")\s*')
@ -212,8 +212,8 @@ class SGMLParser:
def parse_declaration(self, i):
rawdata = self.rawdata
j = i + 2
# in practice, this should look like: ((name|stringlit) S*)+ '>'
while 1:
n = len(rawdata)
while j < n:
c = rawdata[j:j+1]
if c == ">":
# end of declaration syntax
@ -225,19 +225,14 @@ class SGMLParser:
# incomplete or an error?
return -1
j = m.end()
elif c in "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ":
m = declname.match(rawdata, j)
else:
m = decldata.match(rawdata, j)
if not m:
# incomplete or an error?
return -1
j = m.end()
elif i == len(rawdata):
# end of buffer between tokens
return -1
else:
raise SGMLParseError(
"unexpected char in declaration: %s" % `rawdata[i]`)
assert 0, "can't get here!"
# end of buffer between tokens
return -1
# Internal -- parse processing instr, return length or -1 if not terminated
def parse_pi(self, i):