From c0cfeb972b81f59f1002b4128ede4e18465d537f Mon Sep 17 00:00:00 2001
From: fankesyooni <qzmmcn@163.com>
Date: Tue, 13 Sep 2022 02:26:40 +0800
Subject: [PATCH] Modify merge function value hashCode to toString in
 MemberRulesData, FieldRulesData, MethodRulesData, ConstructorRulesData

---
 .../hook/core/finder/members/data/ConstructorRulesData.kt    | 4 +++-
 .../hook/core/finder/members/data/FieldRulesData.kt          | 4 +++-
 .../hook/core/finder/members/data/MemberRulesData.kt         | 4 +++-
 .../hook/core/finder/members/data/MethodRulesData.kt         | 5 +++--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/ConstructorRulesData.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/ConstructorRulesData.kt
index dfdee4ff..14b2c3f1 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/ConstructorRulesData.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/ConstructorRulesData.kt
@@ -51,5 +51,7 @@ internal class ConstructorRulesData internal constructor(
         get() = super.isInitializeOfSuper || paramTypes != null || paramCount >= 0 ||
                 paramCountRange.isEmpty().not() || paramCountConditions != null
 
-    override fun hashCode(other: Any?) = super.hashCode(other) + "[$paramTypes][$paramCount][$paramCountRange]".hashCode()
+    override fun hashCode(other: Any?) = super.hashCode(other) + toString().hashCode()
+
+    override fun toString() = "[$paramTypes][$paramCount][$paramCountRange]"
 }
\ No newline at end of file
diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/FieldRulesData.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/FieldRulesData.kt
index 7c0746fd..8206b472 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/FieldRulesData.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/FieldRulesData.kt
@@ -47,5 +47,7 @@ internal class FieldRulesData internal constructor(
 
     override val isInitialize get() = super.isInitializeOfSuper || name.isNotBlank() || nameConditions != null || type != null
 
-    override fun hashCode(other: Any?) = super.hashCode(other) + "[$name][$nameConditions][$type]".hashCode()
+    override fun hashCode(other: Any?) = super.hashCode(other) + toString().hashCode()
+
+    override fun toString() = "[$name][$nameConditions][$type]"
 }
\ No newline at end of file
diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MemberRulesData.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MemberRulesData.kt
index caf06747..ac3ee68c 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MemberRulesData.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MemberRulesData.kt
@@ -62,5 +62,7 @@ internal open class MemberRulesData internal constructor(
 
     override val isInitialize get() = isInitializeOfSuper || isInitializeOfMatch
 
-    override fun hashCode(other: Any?) = super.hashCode(other) + "[$isFindInSuper][$matchIndex][$matchCountRange]".hashCode()
+    override fun hashCode(other: Any?) = super.hashCode(other) + toString().hashCode()
+
+    override fun toString() = "[$isFindInSuper][$matchIndex][$matchCountRange]"
 }
\ No newline at end of file
diff --git a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MethodRulesData.kt b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MethodRulesData.kt
index 7d93c465..8a772453 100644
--- a/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MethodRulesData.kt
+++ b/yukihookapi/src/api/kotlin/com/highcapable/yukihookapi/hook/core/finder/members/data/MethodRulesData.kt
@@ -58,6 +58,7 @@ internal class MethodRulesData internal constructor(
         get() = super.isInitializeOfSuper || name.isNotBlank() || nameConditions != null || paramTypes != null ||
                 paramCount >= 0 || paramCountRange.isEmpty().not() || paramCountConditions != null || returnType != null
 
-    override fun hashCode(other: Any?) =
-        super.hashCode(other) + "[$name][$nameConditions][$paramTypes][$paramCount][$paramCountRange][$returnType]".hashCode()
+    override fun hashCode(other: Any?) = super.hashCode(other) + toString().hashCode()
+
+    override fun toString() = "[$name][$nameConditions][$paramTypes][$paramCount][$paramCountRange][$returnType]"
 }
\ No newline at end of file