From 383799103bbc68feaff8f89b3a0126a931c8e580 Mon Sep 17 00:00:00 2001 From: AdamZsofi Date: Wed, 22 Mar 2023 16:26:50 +0100 Subject: [PATCH 1/2] Fixed copy-paste error in hash code funcitions --- .../main/java/hu/bme/mit/theta/analysis/prod2/Prod2Prec.java | 2 +- .../main/java/hu/bme/mit/theta/analysis/prod2/Prod2State.java | 4 ++-- .../main/java/hu/bme/mit/theta/analysis/prod3/Prod3Prec.java | 2 +- .../main/java/hu/bme/mit/theta/analysis/prod3/Prod3State.java | 4 ++-- .../main/java/hu/bme/mit/theta/analysis/prod4/Prod4Prec.java | 2 +- .../main/java/hu/bme/mit/theta/analysis/prod4/Prod4State.java | 4 ++-- .../src/main/java/hu/bme/mit/theta/core/type/UnaryExpr.java | 2 +- .../hu/bme/mit/theta/xta/analysis/expl/itp/ItpExplState.java | 2 +- .../hu/bme/mit/theta/xta/analysis/zone/itp/ItpZoneState.java | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod2/Prod2Prec.java b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod2/Prod2Prec.java index 14edf62a89..b6815b9649 100644 --- a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod2/Prod2Prec.java +++ b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod2/Prod2Prec.java @@ -56,7 +56,7 @@ public int hashCode() { result = HASH_SEED; result = 37 * result + prec1.hashCode(); result = 37 * result + prec2.hashCode(); - result = hashCode; + hashCode = result; } return result; } diff --git a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod2/Prod2State.java b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod2/Prod2State.java index 37c327c4b4..0f4ac114bd 100644 --- a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod2/Prod2State.java +++ b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod2/Prod2State.java @@ -157,7 +157,7 @@ public int hashCode() { result = HASH_SEED; result = 37 * result + state1.hashCode(); result = 37 * result + state2.hashCode(); - result = hashCode; + hashCode = result; } return result; } @@ -214,7 +214,7 @@ public final int hashCode() { result = HASH_SEED; result = 37 * result + getIndex(); result = 37 * result + getState().hashCode(); - result = hashCode; + hashCode = result; } return result; } diff --git a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod3/Prod3Prec.java b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod3/Prod3Prec.java index 1d76aa852a..75757c4380 100644 --- a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod3/Prod3Prec.java +++ b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod3/Prod3Prec.java @@ -64,7 +64,7 @@ public int hashCode() { result = 37 * result + prec1.hashCode(); result = 37 * result + prec2.hashCode(); result = 37 * result + prec3.hashCode(); - result = hashCode; + hashCode = result; } return result; } diff --git a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod3/Prod3State.java b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod3/Prod3State.java index 1074c027a4..f1d4eb4375 100644 --- a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod3/Prod3State.java +++ b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod3/Prod3State.java @@ -204,7 +204,7 @@ public int hashCode() { result = 37 * result + state1.hashCode(); result = 37 * result + state2.hashCode(); result = 37 * result + state3.hashCode(); - result = hashCode; + hashCode = result; } return result; } @@ -264,7 +264,7 @@ public final int hashCode() { result = HASH_SEED; result = 37 * result + getIndex(); result = 37 * result + getState().hashCode(); - result = hashCode; + hashCode = result; } return result; } diff --git a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod4/Prod4Prec.java b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod4/Prod4Prec.java index fdb691461e..f9106a1def 100644 --- a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod4/Prod4Prec.java +++ b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod4/Prod4Prec.java @@ -71,7 +71,7 @@ public int hashCode() { result = 37 * result + prec2.hashCode(); result = 37 * result + prec3.hashCode(); result = 37 * result + prec4.hashCode(); - result = hashCode; + hashCode = result; } return result; } diff --git a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod4/Prod4State.java b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod4/Prod4State.java index b603e01692..7795f12227 100644 --- a/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod4/Prod4State.java +++ b/subprojects/common/analysis/src/main/java/hu/bme/mit/theta/analysis/prod4/Prod4State.java @@ -246,7 +246,7 @@ public int hashCode() { result = 37 * result + state2.hashCode(); result = 37 * result + state3.hashCode(); result = 37 * result + state4.hashCode(); - result = hashCode; + hashCode = result; } return result; } @@ -306,7 +306,7 @@ public final int hashCode() { result = HASH_SEED; result = 37 * result + getIndex(); result = 37 * result + getState().hashCode(); - result = hashCode; + hashCode = result; } return result; } diff --git a/subprojects/common/core/src/main/java/hu/bme/mit/theta/core/type/UnaryExpr.java b/subprojects/common/core/src/main/java/hu/bme/mit/theta/core/type/UnaryExpr.java index 05b307a406..bb09e4e7ca 100644 --- a/subprojects/common/core/src/main/java/hu/bme/mit/theta/core/type/UnaryExpr.java +++ b/subprojects/common/core/src/main/java/hu/bme/mit/theta/core/type/UnaryExpr.java @@ -64,7 +64,7 @@ public final int hashCode() { if (result == 0) { result = getHashSeed(); result = 37 * result + getOp().hashCode(); - result = hashCode; + hashCode = result; } return result; } diff --git a/subprojects/xta/xta-analysis/src/main/java/hu/bme/mit/theta/xta/analysis/expl/itp/ItpExplState.java b/subprojects/xta/xta-analysis/src/main/java/hu/bme/mit/theta/xta/analysis/expl/itp/ItpExplState.java index 8500442483..d5b6d49bf3 100644 --- a/subprojects/xta/xta-analysis/src/main/java/hu/bme/mit/theta/xta/analysis/expl/itp/ItpExplState.java +++ b/subprojects/xta/xta-analysis/src/main/java/hu/bme/mit/theta/xta/analysis/expl/itp/ItpExplState.java @@ -78,7 +78,7 @@ public int hashCode() { result = HASH_SEED; result = 37 * result + concrState.hashCode(); result = 37 * result + abstrState.hashCode(); - result = hashCode; + hashCode = result; } return result; } diff --git a/subprojects/xta/xta-analysis/src/main/java/hu/bme/mit/theta/xta/analysis/zone/itp/ItpZoneState.java b/subprojects/xta/xta-analysis/src/main/java/hu/bme/mit/theta/xta/analysis/zone/itp/ItpZoneState.java index 8754ba504a..dd1c834a3f 100644 --- a/subprojects/xta/xta-analysis/src/main/java/hu/bme/mit/theta/xta/analysis/zone/itp/ItpZoneState.java +++ b/subprojects/xta/xta-analysis/src/main/java/hu/bme/mit/theta/xta/analysis/zone/itp/ItpZoneState.java @@ -92,7 +92,7 @@ public int hashCode() { result = HASH_SEED; result = 37 * result + concrState.hashCode(); result = 37 * result + abstrState.hashCode(); - result = hashCode; + hashCode = result; } return result; } From 0b9e2097fbc83d3a1f417d3b971b4caf39600f44 Mon Sep 17 00:00:00 2001 From: AdamZsofi Date: Wed, 22 Mar 2023 16:34:36 +0100 Subject: [PATCH 2/2] Bump patch number --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 04fdbd5ca0..127d63ed37 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -11,7 +11,7 @@ buildscript { allprojects { group = "hu.bme.mit.inf.theta" - version = "4.2.2" + version = "4.2.3" apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts")) }