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

Don't add prop/event 'other' methods to props/events list

Browse Source
This commit is contained in:
de4dot 2011-11-23 04:42:13 +01:00
parent 8d5dae6dcf
commit 1e22947f6a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -703,9 +703,9 @@ namespace de4dot.renamer {
foreach (var scope in allScopes) {
if (scope.hasNonRenamableMethod())
continue;
else if (scope.hasPropertyMethod() && getPropertyMethodType(scope.Methods[0]) != PropertyMethodType.Other)
else if (scope.hasGetterOrSetterPropertyMethod() && getPropertyMethodType(scope.Methods[0]) != PropertyMethodType.Other)
propMethods.add(scope);
else if (scope.hasEventMethod())
else if (scope.hasAddRemoveOrRaiseEventMethod())
eventMethods.add(scope);
else if (scope.hasInterfaceMethod())
ifaceMethods.add(scope);

19
de4dot.code/renamer/asmmodules/MethodNameScopes.cs
View File

@ -58,21 +58,24 @@ namespace de4dot.renamer.asmmodules {
return false;
}
public bool hasPropertyMethod() {
public bool hasGetterOrSetterPropertyMethod() {
foreach (var method in methods) {
if (method.Property != null)
if (method.Property == null)
continue;
var prop = method.Property;
if (method == prop.GetMethod || method == prop.SetMethod)
return true;
}
return false;
}
public bool hasEventMethod() {
public bool hasAddRemoveOrRaiseEventMethod() {
foreach (var method in methods) {
if (method.Event != null) {
var evt = method.Event;
if (method == evt.AddMethod || method == evt.RemoveMethod || method == evt.RaiseMethod)
return true;
}
if (method.Event == null)
continue;
var evt = method.Event;
if (method == evt.AddMethod || method == evt.RemoveMethod || method == evt.RaiseMethod)
return true;
}
return false;
}