Minor bug fix.

data/tools/wesnoth/wmltools.py

@@ -217,7 +217,7 @@ class CrossRef:
         if defn.undef != None:
             # Local macros are only visible in the file where they were defined
             return defn.filename == fn and n >= defn.lineno and n <= defn.undef
-        if self.properties[defn.namespace].get("export") == "yes":
+        if defn.namespace in self.properties and self.properties[defn.namespace].get("export") == "yes":
             # Macros and resources in subtrees with export=yes are global
             return True
         elif not self.filelist.neighbors(defn.filename, fn):

data/tools/wmllint

@@ -1822,6 +1822,23 @@ def translator(filename, mapxforms, textxform, versions):
     else:
         # Map or mask -- just run everything together
         transformed = "".join(newdata)
+    # Simple check for unbalanced macro calls
+    unclosed = None
+    linecount = 1
+    depth = 0
+    for i in range(len(transformed)):
+        if transformed[i] == '\n':
+            linecount += 1
+        elif transformed[i] == '{':
+            if depth == 0:
+                unclosed = linecount
+            depth += 1
+        elif transformed[i] == '}':
+            depth -= 1
+            if depth == 0:
+                unclosed = None
+    if unclosed:
+        print >>sys.stderr, '"%s", line %d: unbalanced {.' % (filename, unclosed)
     # Return None if the transformation functions made no changes.
     if modified:
         return transformed