upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-19 03:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

wmllint had a bug. Fix it, and commit the resulting lifts.

Browse Source
This commit is contained in:
Eric S. Raymond 2008-03-17 12:12:18 +00:00
parent 4cc52f5c5d
commit 39733d0ed1
16 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/campaigns/Descent_Into_Darkness/Descent_macros.cfg
View File

@ -61,7 +61,7 @@
side={SIDE} side={SIDE}
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
random_traits=yes random_traits=yes
upkeep=loyal upkeep=loyal
animate=no animate=no
@ -76,7 +76,7 @@
side={SIDE} side={SIDE}
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
random_traits=yes random_traits=yes
upkeep=loyal upkeep=loyal
animate=no animate=no

2
data/campaigns/Eastern_Invasion/scenarios/05.Northern_Outpost.cfg
View File

@ -76,7 +76,7 @@
side=4 side=4
x=$x1 x=$x1
y=$y1 y=$y1
generate_description=yes generate_name=yes
random_traits=yes random_traits=yes
[/unit] [/unit]
#enddef #enddef

12
data/campaigns/Eastern_Invasion/scenarios/13.Evacuation.cfg
View File

@ -111,7 +111,7 @@
[unit] [unit]
side=2 side=2
type=Troll Warrior type=Troll Warrior
generate_description=yes generate_name=yes
x,y=26,3 x,y=26,3
ai_special=guardian ai_special=guardian
facing=sw facing=sw
@ -119,7 +119,7 @@
[unit] [unit]
side=2 side=2
type=Troll Warrior type=Troll Warrior
generate_description=yes generate_name=yes
x,y=28,5 x,y=28,5
ai_special=guardian ai_special=guardian
facing=sw facing=sw
@ -127,21 +127,21 @@
[unit] [unit]
side=3 side=3
type=Troll Warrior type=Troll Warrior
generate_description=yes generate_name=yes
x,y=8,9 x,y=8,9
ai_special=guardian ai_special=guardian
[/unit] [/unit]
[unit] [unit]
side=3 side=3
type=Troll Warrior type=Troll Warrior
generate_description=yes generate_name=yes
x,y=6,11 x,y=6,11
ai_special=guardian ai_special=guardian
[/unit] [/unit]
[unit] [unit]
side=4 side=4
type=Troll Warrior type=Troll Warrior
generate_description=yes generate_name=yes
x,y=21,11 x,y=21,11
ai_special=guardian ai_special=guardian
facing=sw facing=sw
@ -149,7 +149,7 @@
[unit] [unit]
side=4 side=4
type=Troll Warrior type=Troll Warrior
generate_description=yes generate_name=yes
x,y=18,13 x,y=18,13
ai_special=guardian ai_special=guardian
facing=sw facing=sw

2
data/campaigns/Eastern_Invasion/scenarios/16.The_Council.cfg
View File

@ -131,7 +131,7 @@
[/message] [/message]
[unit] [unit]
id=guard id=guard
generate_description=yes generate_name=yes
type=Royal Guard type=Royal Guard
x=10 x=10
y=18 y=18

2
data/campaigns/Heir_To_The_Throne/scenarios/11_The_Ford_of_Abez.cfg
View File

@ -139,7 +139,7 @@
#define FORD_GUARD X Y #define FORD_GUARD X Y
[unit] [unit]
type=Royal Guard type=Royal Guard
generate_description=yes generate_name=yes
ai_special=guardian ai_special=guardian
x={X} x={X}
y={Y} y={Y}

20
data/campaigns/Heir_To_The_Throne/scenarios/14_Plunging_Into_the_Darkness.cfg
View File

@ -117,7 +117,7 @@
team_name=good team_name=good
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Thunderer type=Dwarvish Thunderer
x=15 x=15
y=22 y=22
@ -128,7 +128,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Fighter type=Dwarvish Fighter
x=10 x=10
y=22 y=22
@ -139,7 +139,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Thunderer type=Dwarvish Thunderer
x=13 x=13
y=20 y=20
@ -150,7 +150,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Fighter type=Dwarvish Fighter
x=11 x=11
y=20 y=20
@ -161,7 +161,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Thunderer type=Dwarvish Thunderer
x=13 x=13
y=19 y=19
@ -172,7 +172,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Fighter type=Dwarvish Fighter
x=11 x=11
y=19 y=19
@ -183,7 +183,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Thunderer type=Dwarvish Thunderer
x=8 x=8
y=20 y=20
@ -194,7 +194,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Fighter type=Dwarvish Fighter
x=17 x=17
y=19 y=19
@ -205,7 +205,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Thunderer type=Dwarvish Thunderer
x=15 x=15
y=16 y=16
@ -216,7 +216,7 @@
[/modifications] [/modifications]
[/unit] [/unit]
[unit] [unit]
generate_description=yes generate_name=yes
type=Dwarvish Fighter type=Dwarvish Fighter
x=9 x=9
y=16 y=16

4
data/campaigns/Heir_To_The_Throne/scenarios/16_Hasty_Alliance.cfg
View File

@ -157,7 +157,7 @@
[unit] [unit]
type=Royal Guard type=Royal Guard
generate_description=yes generate_name=yes
side=2 side=2
x=11 x=11
y=18 y=18
@ -178,7 +178,7 @@
[unit] [unit]
type=Royal Guard type=Royal Guard
generate_description=yes generate_name=yes
side=2 side=2
x=11 x=11
y=19 y=19

2
data/campaigns/Heir_To_The_Throne/scenarios/20a_North_Elves.cfg
View File

@ -224,7 +224,7 @@
type={TYPE} type={TYPE}
x,y={X},{Y} x,y={X},{Y}
ai_special=guardian ai_special=guardian
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
# #

32
data/campaigns/Heir_To_The_Throne/utils/httt_utils.cfg
View File

@ -730,7 +730,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -745,7 +745,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -760,7 +760,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -775,7 +775,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -790,7 +790,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -805,7 +805,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -820,7 +820,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -835,7 +835,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -850,7 +850,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -865,7 +865,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -880,7 +880,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -895,7 +895,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -910,7 +910,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -925,7 +925,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -940,7 +940,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]
@ -955,7 +955,7 @@ _f, _f, _f, _f, _f, _f, Re, _f, _f, _f, _f, _f,
side=2 side=2
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
generate_traits=yes generate_traits=yes
ai_special=guardian ai_special=guardian
[/unit] [/unit]

6
data/campaigns/Liberty/scenarios/05_Hide_and_Seek.cfg
View File

@ -153,7 +153,7 @@
#define SEEKER X Y TYPE #define SEEKER X Y TYPE
[unit] [unit]
type={TYPE} type={TYPE}
generate_description=yes generate_name=yes
x,y={X},{Y} x,y={X},{Y}
side=2 side=2
random_traits=yes random_traits=yes
@ -231,7 +231,7 @@
side=2 side=2
type=$guard_type type=$guard_type
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
[store_unit] [store_unit]
@ -344,7 +344,7 @@
type=$assistant_guard_type type=$assistant_guard_type
side=2 side=2
x,y=$new_assistant_guard_locations[$random_i].x,$new_assistant_guard_locations[$random_i].y x,y=$new_assistant_guard_locations[$random_i].x,$new_assistant_guard_locations[$random_i].y
generate_description=yes generate_name=yes
random_traits=yes random_traits=yes
[/unit] [/unit]

2
data/campaigns/Liberty/scenarios/08_Glory.cfg
View File

@ -308,7 +308,7 @@
x={X} x={X}
y={Y} y={Y}
ai_special=guardian ai_special=guardian
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
{MK_GUARD 2 (Royal Guard) 16 13} {MK_GUARD 2 (Royal Guard) 16 13}

26
data/campaigns/Northern_Rebirth/utils/utils.cfg
View File

@ -69,7 +69,7 @@
side=3 side=3
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -81,7 +81,7 @@
side=3 side=3
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -93,7 +93,7 @@
side=3 side=3
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -105,7 +105,7 @@
side=3 side=3
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -116,7 +116,7 @@
y={Y} y={Y}
side=2 side=2
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -127,7 +127,7 @@
y={Y} y={Y}
side=2 side=2
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -138,7 +138,7 @@
y={Y} y={Y}
side=2 side=2
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -150,7 +150,7 @@
side=2 side=2
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -162,7 +162,7 @@
side=2 side=2
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -175,7 +175,7 @@
side=9 side=9
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -187,7 +187,7 @@
side=9 side=9
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -199,7 +199,7 @@
side=9 side=9
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef
@ -211,7 +211,7 @@
side=9 side=9
ai_special=guardian ai_special=guardian
random_traits=yes random_traits=yes
generate_description=yes generate_name=yes
[/unit] [/unit]
#enddef #enddef

2
data/campaigns/Sceptre_of_Fire/scenarios/3_Searching_for_the_Runecrafter.cfg
View File

@ -56,7 +56,7 @@
[/set_variable] [/set_variable]
[unit] [unit]
x,y={X},{Y} x,y={X},{Y}
generate_description=yes generate_name=yes
random_traits=yes random_traits=yes
type=$typeofenemy type=$typeofenemy
side=2 side=2

4
data/core/macros/unit-utils.cfg
View File

@ -11,7 +11,7 @@
type={TYPE} type={TYPE}
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
random_traits=yes random_traits=yes
random_gender=yes random_gender=yes
upkeep=full upkeep=full
@ -29,7 +29,7 @@
type={TYPE} type={TYPE}
x={X} x={X}
y={Y} y={Y}
generate_description=yes generate_name=yes
random_traits=no random_traits=no
random_gender=yes random_gender=yes
[/unit] [/unit]

2
data/multiplayer/scenarios/2p_Dark_Forecast.cfg
View File

@ -65,7 +65,7 @@
type=$spawns[$id].type type=$spawns[$id].type
x=$spawns[$id].x x=$spawns[$id].x
y=$spawns[$id].y y=$spawns[$id].y
generate_description=yes generate_name=yes
random_traits=no random_traits=no
[modifications] [modifications]
[object] [object]

38
data/tools/wmllint
View File

@ -2023,16 +2023,16 @@ if __name__ == '__main__':
"Resource-name transformation on text lines." "Resource-name transformation on text lines."
if not upconvert: if not upconvert:
return line return line
transformed = line original = line
# First, do resource-file moves # First, do resource-file moves
if "wmllint: noconvert" not in line: if "wmllint: noconvert" not in original:
for step in fileconversions: for step in fileconversions:
for (old, new) in step: for (old, new) in step:
transformed = old.sub(new, transformed) line = old.sub(new, line)
# Handle terrain_liked=, terrain=, valid_terrain=, letter= # Handle terrain_liked=, terrain=, valid_terrain=, letter=
spaceless = transformed.replace(" ", "").replace("\t", "") spaceless = line.replace(" ", "").replace("\t", "")
if spaceless and spaceless[0] != "#" and ("terrain_liked=" in spaceless or "terrain=" in spaceless or 'letter=' in spaceless) and "wmllint:ignore" not in spaceless: if spaceless and spaceless[0] != "#" and ("terrain_liked=" in spaceless or "terrain=" in spaceless or 'letter=' in spaceless) and "wmllint:ignore" not in spaceless:
(key, pre, value, post) = parse_attribute(transformed) (key, pre, value, post) = parse_attribute(line)
# We have to cope with the following cases... # We have to cope with the following cases...
# Old style: # Old style:
# terrain_liked=ghM # terrain_liked=ghM
@ -2090,22 +2090,22 @@ if __name__ == '__main__':
newterrains += c newterrains += c
if newterrains.endswith(","): if newterrains.endswith(","):
newterrains = newterrains[:-1] newterrains = newterrains[:-1]
transformed = pre + newterrains + post line = pre + newterrains + post
if newstyle: if newstyle:
if len(value) == 2: if len(value) == 2:
# 1.3.1 to 1.3.2 conversion # 1.3.1 to 1.3.2 conversion
for (old, new) in conversion2.items(): for (old, new) in conversion2.items():
transformed = old.sub(new, transformed) line = old.sub(new, line)
# Check for things marked translated that aren't strings # Check for things marked translated that aren't strings
if "_" in transformed and not "wmllint: ignore" in transformed: if "_" in line and not "wmllint: ignore" in line:
m = re.search(r'[=(]\s*_\s+("?)', transformed) m = re.search(r'[=(]\s*_\s+("?)', line)
if m and not m.group(1): if m and not m.group(1):
msg = '"%s", line %d: translatability mark before non-string' % \ msg = '"%s", line %d: translatability mark before non-string' % \
(filename, lineno) (filename, lineno)
print >>sys.stderr, msg print >>sys.stderr, msg
# Perform unconditional line changes # Perform unconditional line changes
for (old, new) in linechanges: for (old, new) in linechanges:
transformed = transformed.replace(old, new) line = line.replace(old, new)
# Perform tag renaming. Note: this has to happen before # Perform tag renaming. Note: this has to happen before
# the sanity check, which assumes [unit] has already been # the sanity check, which assumes [unit] has already been
# mapped to [unit_type]. Also, beware that this test will fail to # mapped to [unit_type]. Also, beware that this test will fail to
@ -2115,9 +2115,9 @@ if __name__ == '__main__':
if upconvert and "1.3.14" in versions: if upconvert and "1.3.14" in versions:
# UnitWML # UnitWML
if "units" in filename: if "units" in filename:
transformed = transformed.replace("[unit]", "[unit_type]") line = line.replace("[unit]", "[unit_type]")
transformed = transformed.replace("[+unit]", "[+unit_type]") line = line.replace("[+unit]", "[+unit_type]")
transformed = transformed.replace("[/unit]", "[/unit_type]") line = line.replace("[/unit]", "[/unit_type]")
elif verbose > 1 and "unit]" in line and not within(("scenario","multiplayer","test","tutorial")): elif verbose > 1 and "unit]" in line and not within(("scenario","multiplayer","test","tutorial")):
print "%s, line %d: [unit] may need conversion to [unit_type]" % \ print "%s, line %d: [unit] may need conversion to [unit_type]" % \
(filename, lineno) (filename, lineno)
@ -2129,12 +2129,12 @@ if __name__ == '__main__':
under("side") or \ under("side") or \
re.search("{[A-Z]+.*description=.*}", line): re.search("{[A-Z]+.*description=.*}", line):
if "id" not in tagstack[-1][1]: if "id" not in tagstack[-1][1]:
transformed = re.sub(r"\bdescription\s*=", "id=", line) line = re.sub(r"\bdescription\s*=", "id=", line)
if "name" not in tagstack[-1][1]: if "name" not in tagstack[-1][1]:
transformed = re.sub(r"user_description\s*=", "name=", line) line = re.sub(r"user_description\s*=", "name=", line)
# Now, inside objects... # Now, inside objects...
if under("object") and "description" not in tagstack[-1][1]: if under("object") and "description" not in tagstack[-1][1]:
transformed = re.sub(r"user_description\s*=", "description=", line) line = re.sub(r"user_description\s*=", "description=", line)
# Alas, WML variable references cannot be converted so # Alas, WML variable references cannot be converted so
# automatically. # automatically.
if ".description" in line: if ".description" in line:
@ -2147,11 +2147,11 @@ if __name__ == '__main__':
if within("theme"): if within("theme"):
line = line.replace("[unit_description]", "[unit_name]") line = line.replace("[unit_description]", "[unit_name]")
# Report the changes # Report the changes
if verbose > 0 and transformed != line: if verbose > 0 and line != original:
msg = "%s, line %d: %s -> %s" % \ msg = "%s, line %d: %s -> %s" % \
(filename, lineno, line.strip(), transformed.strip()) (filename, lineno, line.strip(), line.strip())
print msg print msg
return transformed return line
try: try:
if upconvert and "1.3.1" in versions and "older" not in versions: if upconvert and "1.3.1" in versions and "older" not in versions: