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

More improvements in convenience methods.

Browse source 
The tag for a macro opener has had '}' removed, to make it
visually clear that it is unbalanced.
This commit is contained in:
Eric S. Raymond 2009-03-31 00:53:35 +00:00
parent 54c8c733c3
commit 8f3b65075c
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -83,10 +83,12 @@ def isMacroOpener(elem):
return type(elem) == type("") and elem.startswith("{")
def isAttribute(elem):
"Are we looking at an attribute?"
"Are we looking at an attribute (or attribute tuple)?"
if isinstance(elem, WmlIterator):
elem = elem.element
return type(elem) == type(()) or (type(elem) == type("") and elem.endswith("="))
if type(elem) == type(()):
elem = elem[0]
return type(elem) == type("") and elem.endswith("=")
class WmlIterator(object):
"""Return an iterable WML navigation object.
@ -254,7 +256,7 @@ Important Attributes:
if k:
elements.append((k+'=', m.start()+i, 0))
for m in macroOpenPattern.finditer(text):
elements.append((m.group(1)+'}', m.start(), 1))
elements.append((m.group(1), m.start(), 1))
for m in macroClosePattern.finditer(text):
elements.append((closeMacroType, m.start(), -1))
#sort by start position