Autodoc: The set of modifiers for a symbol is now on a more canonic form.

lib/modules/Tools.pmod/AutoDoc.pmod/PikeParser.pike

@@ -660,10 +660,28 @@ array(string) parseModifiers() {
   string s = peekToken();
   array(string) mods = ({ });
   while (modifiers[s]) {
+    // Canonicalize some aliases.
+    s = ([ "nomask":"final",
+	   "static":"protected",
+	   "inline":"local",
+    ])[s] || s;
+    if (!has_value(mods, s)) {
       mods += ({ s });
+    }
     readToken();
     s = peekToken();
   }
+  if (sizeof(mods) > 1) {
+    // Clean up implied modifiers.
+    if (has_value(mods, "private")) {
+      // private implies protected.
+      mods -= ({ "protected", });
+    }
+    if (has_value(mods, "final")) {
+      // final implies local.
+      mods -= ({ "local" });
+    }
+  }
   return mods;
 }