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

Revert older commit and print method override prefix

Browse Source
This commit is contained in:
de4dot 2011-11-23 12:13:41 +01:00
parent 4a65770c59
commit 99d52b90c5
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -925,10 +925,8 @@ namespace de4dot.renamer {
} }
static readonly Regex removeGenericsArityRegex = new Regex(@"`[0-9]+"); static readonly Regex removeGenericsArityRegex = new Regex(@"`[0-9]+");
static string getOverridePrefix(MethodNameScope scope, MethodDef method) { static string getOverridePrefix(MethodDef method) {
if (scope.Methods.Count != 1) if (method == null || method.MethodDefinition.Overrides.Count == 0)
return "";
if (method.MethodDefinition.Overrides.Count == 0)
return ""; 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('/', '.');
@ -969,7 +967,7 @@ namespace de4dot.renamer {
else else
methodPrefix = null; methodPrefix = null;
overridePrefix = getOverridePrefix(scope, eventMethod); overridePrefix = getOverridePrefix(eventMethod);
if (renameOverrides && overridePrefix == "") if (renameOverrides && overridePrefix == "")
return null; return null;
if (!renameOverrides && overridePrefix != "") if (!renameOverrides && overridePrefix != "")
@ -1053,7 +1051,7 @@ namespace de4dot.renamer {
if (propMethod == null) if (propMethod == null)
throw new ApplicationException("No properties found"); throw new ApplicationException("No properties found");
overridePrefix = getOverridePrefix(scope, propMethod); overridePrefix = getOverridePrefix(propMethod);
if (renameOverrides && overridePrefix == "") if (renameOverrides && overridePrefix == "")
return null; return null;
@ -1176,6 +1174,14 @@ namespace de4dot.renamer {
return type; return type;
} }
MethodDef getOverrideMethod(MethodNameScope scope) {
foreach (var method in scope.Methods) {
if (method.MethodDefinition.Overrides.Count > 0)
return method;
}
return null;
}
void prepareRenameVirtualMethods(MethodNameScope scope, string namePrefix, bool renameOverrides) { void prepareRenameVirtualMethods(MethodNameScope scope, string namePrefix, bool renameOverrides) {
if (!hasInvalidMethodName(scope)) if (!hasInvalidMethodName(scope))
return; return;
@ -1189,8 +1195,8 @@ namespace de4dot.renamer {
} }
} }
var overrideMethod = scope.Methods[0]; var overrideMethod = getOverrideMethod(scope);
var overridePrefix = getOverridePrefix(scope, overrideMethod); var overridePrefix = getOverridePrefix(overrideMethod);
if (renameOverrides && overridePrefix == "") if (renameOverrides && overridePrefix == "")
return; return;
if (!renameOverrides && overridePrefix != "") if (!renameOverrides && overridePrefix != "")