0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Greatly simplify quote scanning in WmlIterator.

Browse source 
The old code tended to break on multiline strings ending with '"\n',
and was too complicated for me to debug.  The new code behaves better
in general, though it will throw an error on one pathological case the
old case seemed to handle -- single-line string followed by a comment
with an unbalanced double quote in it.
This commit is contained in:
Eric S. Raymond 2008-11-07 14:07:24 +00:00
parent a82adb3bdf
commit d94b7d9592
1 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
data/tools/wesnoth/wmliterator.py
View file

@ -115,28 +115,16 @@ Important Attributes:
def parseQuotes(self, lines):
"""Return the line or multiline text if a quote spans multiple lines"""
text = lines[self.lineno]
span = 1
begincomment = text.find('#')
if begincomment < 0:
begincomment = None
beginquote = text[:begincomment].find('"')
while beginquote >= 0:
endquote = -1
beginofend = beginquote+1
while endquote < 0:
endquote = text.find('"', beginofend)
if endquote < 0:
if self.lineno + span >= len(lines):
self.printError('reached EOF due to unterminated string')
return text, span
text += lines[self.lineno + span]
span += 1
beginofend = text.rfind('\n', beginofend, len(text)-1)
begincomment = text.find('#', endquote+1)
if begincomment < 0:
begincomment = None
beginquote = text[:begincomment].find('"', endquote+1)
text = ""
span = 0
try:
while True:
text += lines[self.lineno + span]
span += 1
if text.count('"') % 2 == 0:
break
except IndexError:
self.printError('unclosed string beginning here')
return text, span
def closeScope(self, scopes, closerElement):
@ -400,7 +388,7 @@ if __name__ == '__main__':
f = open(fname)
itor = WmlIterator(f.readlines())
for i in itor:
pass
print "Element = %s, text = %s, ancestors = %s" % (`i.element`, `i.text`, i.ancestors())
f.close()
print itor.lineno + itor.span, 'lines read.'
if not didSomething: