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

Partial fix for bug #15996.

Browse source 
This fixes unresolved references but not mismatched references.
This commit is contained in:
Sergey Popov 2010-05-08 11:53:02 +00:00
parent 92a168d4ff
commit 95517b8fe3
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
data/tools/wesnoth/wmltools.py
View file

@ -306,8 +306,11 @@ class CrossRef:
def mark_matching_resources(self, pattern, fn, n):
"Mark all definitions matching a specified pattern with a reference."
pattern = pattern.replace("+", r"\+")
pattern = os.sep + pattern + "$"
if os.sep == "\\":
pattern = pattern.replace("\\", "\\\\")
try:
pattern = re.compile(os.sep + pattern + "$")
pattern = re.compile(pattern)
except sre_constants.error:
print >>sys.stderr, "wmlscope: confused by %s" % pattern
return None
@ -615,6 +618,8 @@ class CrossRef:
# Catches maps that look like macro names.
if (name.endswith(".map") or name.endswith(".mask")) and name[0] == '{':
name = name[1:]
if os.sep == "\\":
name = name.replace("/", "\\")
key = None
# If name is already in our resource list, it's easy.
if name in self.fileref and self.visible_from(name, fn, n):