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

wmltools: cite define locations when "more than one definition" is visible

Browse source 
When "more than one resource" is visible, wmlscope tells you where they
are.  Now it will do the same for macro definitions.
This commit is contained in:
Groggy Dice 2014-08-01 04:37:56 -04:00
parent 3d11b84611
commit 2d864b5eff
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -606,7 +606,7 @@ class CrossRef:
# Find references to macros
for match in re.finditer(CrossRef.macro_reference, line):
name = match.group(1)
candidates = 0
candidates = []
if self.warnlevel >=2:
print '"%s", line %d: seeking definition of %s' \
% (fn, n+1, name)
@ -627,11 +627,11 @@ class CrossRef:
# Figure out which macros might resolve this
for defn in self.xref[name]:
if self.visible_from(defn, fn, n+1):
candidates += 1
defn.append(fn, n+1, args)
if candidates > 1:
print "%s: more than one definition of %s is visible here." % (Reference(ns, fn, n), name)
if candidates == 0:
candidates.append(str(defn))
if len(candidates) > 1:
print "%s: more than one definition of %s is visible here (%s)." % (Reference(ns, fn, n), name, "; ".join(candidates))
if len(candidates) == 0:
self.unresolved.append((name,Reference(ns,fn,n+1,args=args)))
# Don't be fooled by HTML image references in help strings.
if "<img>" in line: