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

Add support for ifhave/ifnhave to wmllint and wmliterator (bug #17159)

Browse source
This commit is contained in:
Alexander van Gessel 2010-11-27 21:45:10 +01:00
parent dd3c3eab16
commit 372d50c847
2 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,7 @@ def isDirective(elem):
"Identify things that shouldn't be indented."
if isinstance(elem, WmlIterator):
elem = elem.element
for prefix in ("#ifdef", "#ifndef", "#else", "#endif", "#define", "#enddef", "#undef"):
for prefix in ("#ifdef", "#ifndef", "#ifhave", "#ifnhave", "#else", "#endif", "#define", "#enddef", "#undef"):
if elem.startswith(prefix):
return True
return False
@ -216,9 +216,11 @@ Important Attributes:
keys: either "key=" or ("key1=", "key2=") for multi-assignment
key= - does not affect the scope
key1,key2= - multi-assignment returns multiple elements
directives: one of "#ifdef", "#ifndef", "#else", "#endif", "#define", "#enddef"
directives: one of "#ifdef", "#ifndef", "#ifhave", "#ifnhave", "#else", "#endif", "#define", "#enddef"
#ifdef - opens a scope
#ifndef - opens a scope
#ifhave - opens a scope
#ifnhave - opens a scope
#else - closes a scope, also opens a new scope
#endif - closes a scope
#define - opens a scope
@ -255,6 +257,10 @@ Important Attributes:
return (['#ifdef'],)*2
elif text.startswith('#ifndef'):
return (['#ifndef'],)*2
elif text.startswith('#ifhave'):
return (['#ifhave'],)*2
elif text.startswith('#ifnhave'):
return (['#ifnhave'],)*2
elif text.startswith('#else'):
if not self.closeScope(self.scopes, '#else'):
self.printScopeError('#else')

4
data/tools/wmllint
View file

@ -1023,10 +1023,10 @@ def global_sanity_check(filename, lines):
recruitment_pattern = {}
ifdef_stack = [None]
for i in range(len(lines)):
if lines[i].startswith("#ifdef"):
if lines[i].startswith("#ifdef") or lines[i].startswith("#ifhave"):
ifdef_stack.append(lines[i].strip().split()[1])
continue
if lines[i].startswith("#ifndef"):
if lines[i].startswith("#ifndef") or lines[i].startswith("#ifnhave"):
ifdef_stack.append("!" + lines[i].strip().split()[1])
continue
if lines[i].startswith("#else"):