monocul.us/de4dot-cex
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't add an override prefix if one of the methods is an iface method

Browse Source
This commit is contained in:
de4dot 2011-11-23 14:39:52 +01:00
parent 99d52b90c5
commit 9d61d9845d
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
de4dot.code/renamer/Renamer.cs
View File

@ -819,10 +819,10 @@ namespace de4dot.renamer {
memberInfos.type(typeDef).initializeEventHandlerNames(); memberInfos.type(typeDef).initializeEventHandlerNames();
prepareHelper.prepare((info) => info.prepareRenameMethods()); prepareHelper.prepare((info) => info.prepareRenameMethods());
virtualMethods.visitAll((scope) => prepareRenameVirtualMethods(scope, "vmethod_", false));
ifaceMethods.visitAll((scope) => prepareRenameVirtualMethods(scope, "imethod_", false)); ifaceMethods.visitAll((scope) => prepareRenameVirtualMethods(scope, "imethod_", false));
virtualMethods.visitAll((scope) => prepareRenameVirtualMethods(scope, "vmethod_", true)); virtualMethods.visitAll((scope) => prepareRenameVirtualMethods(scope, "vmethod_", false));
ifaceMethods.visitAll((scope) => prepareRenameVirtualMethods(scope, "imethod_", true)); ifaceMethods.visitAll((scope) => prepareRenameVirtualMethods(scope, "imethod_", true));
virtualMethods.visitAll((scope) => prepareRenameVirtualMethods(scope, "vmethod_", true));
foreach (var typeDef in modules.AllTypes) foreach (var typeDef in modules.AllTypes)
memberInfos.type(typeDef).prepareRenameMethods2(); memberInfos.type(typeDef).prepareRenameMethods2();
@ -925,9 +925,16 @@ namespace de4dot.renamer {
} }
static readonly Regex removeGenericsArityRegex = new Regex(@"`[0-9]+"); static readonly Regex removeGenericsArityRegex = new Regex(@"`[0-9]+");
static string getOverridePrefix(MethodDef method) { static string getOverridePrefix(MethodNameScope scope, MethodDef method) {
if (method == null || method.MethodDefinition.Overrides.Count == 0) if (method == null || method.MethodDefinition.Overrides.Count == 0)
return ""; return "";
if (scope.Methods.Count > 1) {
// Don't use an override prefix if the scope has an iface method.
foreach (var m in scope.Methods) {
if (m.Owner.TypeDefinition.IsInterface)
return "";
}
}
var overrideMethod = method.MethodDefinition.Overrides[0]; var overrideMethod = method.MethodDefinition.Overrides[0];
var name = overrideMethod.DeclaringType.FullName.Replace('/', '.'); var name = overrideMethod.DeclaringType.FullName.Replace('/', '.');
name = removeGenericsArityRegex.Replace(name, ""); name = removeGenericsArityRegex.Replace(name, "");
@ -967,7 +974,7 @@ namespace de4dot.renamer {
else else
methodPrefix = null; methodPrefix = null;
overridePrefix = getOverridePrefix(eventMethod); overridePrefix = getOverridePrefix(scope, eventMethod);
if (renameOverrides && overridePrefix == "") if (renameOverrides && overridePrefix == "")
return null; return null;
if (!renameOverrides && overridePrefix != "") if (!renameOverrides && overridePrefix != "")
@ -1051,7 +1058,7 @@ namespace de4dot.renamer {
if (propMethod == null) if (propMethod == null)
throw new ApplicationException("No properties found"); throw new ApplicationException("No properties found");
overridePrefix = getOverridePrefix(propMethod); overridePrefix = getOverridePrefix(scope, propMethod);
if (renameOverrides && overridePrefix == "") if (renameOverrides && overridePrefix == "")
return null; return null;
@ -1196,7 +1203,7 @@ namespace de4dot.renamer {
} }
var overrideMethod = getOverrideMethod(scope); var overrideMethod = getOverrideMethod(scope);
var overridePrefix = getOverridePrefix(overrideMethod); var overridePrefix = getOverridePrefix(scope, overrideMethod);
if (renameOverrides && overridePrefix == "") if (renameOverrides && overridePrefix == "")
return; return;
if (!renameOverrides && overridePrefix != "") if (!renameOverrides && overridePrefix != "")