Author: esr
Date: Fri Apr  6 09:44:12 2007
New Revision: 16627

URL: http://svn.gna.org/viewcvs/wesnoth?rev=16627&view=rev
Log:
Improve comment handling and macro name recognition in macroscope.

Modified:
    trunk/data/tools/macroscope

Modified: trunk/data/tools/macroscope
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/data/tools/macroscope?rev=16627&r1=16626&r2=16627&view=diff
==============================================================================
--- trunk/data/tools/macroscope (original)
+++ trunk/data/tools/macroscope Fri Apr  6 09:44:12 2007
@@ -75,9 +75,11 @@
                     formals = line.split()[2:]
                 elif line.startswith("#enddef"):
                     formals = []
-                if line[0] == "#" or "{" not in line:
+                if '#' in line:
+                    line = line.split('#')[0]
+                if not line or "{" not in line:
                     continue
-                for match in re.finditer(r"\{([A-Z][A-Z0-9_:]*[A-Z0-9])\b", 
line):
+                for match in re.finditer(r"\{([A-Z][A-Z0-9_:]*[A-Z0-9_])\b", 
line):
                     name = match.group(1)
                     if name in formals:
                         continue


_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits

Reply via email to