From bbe41696b1d55b2e30d57d7a4087c62ae470e6d4 Mon Sep 17 00:00:00 2001
From: de4dot <de4dot@gmail.com>
Date: Thu, 22 Jan 2015 13:26:09 +0100
Subject: [PATCH] Allow comparing privatescope fields/methods

---
 de4dot.blocks/MemberDefDict.cs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/de4dot.blocks/MemberDefDict.cs b/de4dot.blocks/MemberDefDict.cs
index 85c4f273..b050071f 100644
--- a/de4dot.blocks/MemberDefDict.cs
+++ b/de4dot.blocks/MemberDefDict.cs
@@ -519,6 +519,7 @@ namespace de4dot.blocks {
 	}
 
 	sealed class FieldRefKey : IFieldRefKey {
+		static SigComparerOptions SIG_COMPARER_FLAGS = SigComparerOptions.PrivateScopeFieldIsComparable;
 		readonly IField fieldRef;
 
 		public IField FieldRef {
@@ -530,14 +531,14 @@ namespace de4dot.blocks {
 		}
 
 		public override int GetHashCode() {
-			return new SigComparer().GetHashCode(fieldRef);
+			return new SigComparer(SIG_COMPARER_FLAGS).GetHashCode(fieldRef);
 		}
 
 		public override bool Equals(object obj) {
 			var other = obj as FieldRefKey;
 			if (other == null)
 				return false;
-			return new SigComparer().Equals(fieldRef, other.fieldRef);
+			return new SigComparer(SIG_COMPARER_FLAGS).Equals(fieldRef, other.fieldRef);
 		}
 
 		public override string ToString() {
@@ -546,6 +547,7 @@ namespace de4dot.blocks {
 	}
 
 	sealed class MethodRefKey : IMethodRefKey {
+		static SigComparerOptions SIG_COMPARER_FLAGS = SigComparerOptions.PrivateScopeMethodIsComparable;
 		readonly IMethod methodRef;
 
 		public IMethod MethodRef {
@@ -557,14 +559,14 @@ namespace de4dot.blocks {
 		}
 
 		public override int GetHashCode() {
-			return new SigComparer().GetHashCode(methodRef);
+			return new SigComparer(SIG_COMPARER_FLAGS).GetHashCode(methodRef);
 		}
 
 		public override bool Equals(object obj) {
 			var other = obj as MethodRefKey;
 			if (other == null)
 				return false;
-			return new SigComparer().Equals(methodRef, other.methodRef);
+			return new SigComparer(SIG_COMPARER_FLAGS).Equals(methodRef, other.methodRef);
 		}
 
 		public override string ToString() {
@@ -573,6 +575,7 @@ namespace de4dot.blocks {
 	}
 
 	sealed class FieldRefAndDeclaringTypeKey : IFieldRefKey {
+		static SigComparerOptions SIG_COMPARER_FLAGS = SigComparerOptions.CompareMethodFieldDeclaringType | SigComparerOptions.PrivateScopeFieldIsComparable;
 		readonly IField fieldRef;
 
 		public IField FieldRef {
@@ -584,14 +587,14 @@ namespace de4dot.blocks {
 		}
 
 		public override int GetHashCode() {
-			return new SigComparer(SigComparerOptions.CompareMethodFieldDeclaringType).GetHashCode(fieldRef);
+			return new SigComparer(SIG_COMPARER_FLAGS).GetHashCode(fieldRef);
 		}
 
 		public override bool Equals(object obj) {
 			var other = obj as FieldRefAndDeclaringTypeKey;
 			if (other == null)
 				return false;
-			return new SigComparer(SigComparerOptions.CompareMethodFieldDeclaringType).Equals(fieldRef, other.fieldRef);
+			return new SigComparer(SIG_COMPARER_FLAGS).Equals(fieldRef, other.fieldRef);
 		}
 
 		public override string ToString() {
@@ -600,6 +603,7 @@ namespace de4dot.blocks {
 	}
 
 	sealed class MethodRefAndDeclaringTypeKey : IMethodRefKey {
+		static SigComparerOptions SIG_COMPARER_FLAGS = SigComparerOptions.CompareMethodFieldDeclaringType | SigComparerOptions.PrivateScopeMethodIsComparable;
 		readonly IMethod methodRef;
 
 		public IMethod MethodRef {
@@ -611,14 +615,14 @@ namespace de4dot.blocks {
 		}
 
 		public override int GetHashCode() {
-			return new SigComparer(SigComparerOptions.CompareMethodFieldDeclaringType).GetHashCode(methodRef);
+			return new SigComparer(SIG_COMPARER_FLAGS).GetHashCode(methodRef);
 		}
 
 		public override bool Equals(object obj) {
 			var other = obj as MethodRefAndDeclaringTypeKey;
 			if (other == null)
 				return false;
-			return new SigComparer(SigComparerOptions.CompareMethodFieldDeclaringType).Equals(methodRef, other.methodRef);
+			return new SigComparer(SIG_COMPARER_FLAGS).Equals(methodRef, other.methodRef);
 		}
 
 		public override string ToString() {