Author: sapient
Date: Tue Mar 31 00:16:37 2009
New Revision: 34307
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34307&view=rev
Log:
wmliterator : upgrade closeMacroType to actual element
Modified:
trunk/data/tools/wesnoth/wmliterator.py
Modified: trunk/data/tools/wesnoth/wmliterator.py
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/wesnoth/wmliterator.py?rev=34307&r1=34306&r2=34307&view=diff
==============================================================================
--- trunk/data/tools/wesnoth/wmliterator.py (original)
+++ trunk/data/tools/wesnoth/wmliterator.py Tue Mar 31 00:16:37 2009
@@ -68,7 +68,7 @@
"Are we looking at a macro closer?"
if isinstance(elem, WmlIterator):
elem = elem.element
- return type(elem) == type("") and elem.startswith("}")
+ return type(elem) == type("") and elem == closeMacroType
def isOpener(elem):
"Are we looking at an opening tag?"
@@ -270,8 +270,7 @@
while scopeDelta > 0:
openedScopes.append(elem)
scopeDelta -= 1
- if elem != closeMacroType:
- resultElements.append(elem)
+ resultElements.append(elem)
return resultElements, openedScopes
def printScopeError(self, elementType):
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
