From 711aa70d48f6efe2e357614223716ab2c28fe35c Mon Sep 17 00:00:00 2001
From: Daniel Holle <dholle@hb.dhbw-stuttgart.de>
Date: Thu, 22 Jun 2023 09:34:15 +0200
Subject: [PATCH] Update to java 20 and some refactoring

---
 pom.xml                                           |   8 ++++----
 resources/bytecode/javFiles/Cycle.class           | Bin 477 -> 0 bytes
 .../javFiles}/TestAny.jav                         |   0
 .../javFiles}/TestAssign.jav                      |   0
 .../javFiles}/TestClassField.jav                  |   0
 .../javFiles}/TestContraVariant.jav               |   0
 .../javFiles}/TestGGFinder.jav                    |   0
 .../javFiles}/TestLocalVarLambda.jav              |   0
 .../javFiles}/TestMutualRecursion.jav             |   0
 .../javFiles}/TestMutualRecursionWithField.jav    |   0
 .../javFiles}/TestMutualRecursionWithField2.jav   |   0
 .../javFiles}/TestMutualRecursionWithField3.jav   |   0
 .../javFiles}/TestReturnVar.jav                   |   0
 .../TestSecondLineOfClassConstraints.jav          |   0
 .../javFiles}/TestTPHsAndGenerics.jav             |   0
 .../javFiles}/TestTPHsAndGenerics2.jav            |   1 +
 .../javFiles}/TestThreeArgs.jav                   |   0
 .../javFiles}/TestTwoArgs.jav                     |   0
 .../javFiles}/TestTwoArgs2.jav                    |   0
 .../javFiles}/TestTwoCalls.jav                    |   0
 .../javFiles}/TestVector.jav                      |   4 +++-
 .../javFiles}/TestVectorArg.jav                   |   0
 .../javFiles}/TestVoidMeth.jav                    |   0
 resources/javFiles/Lambda.jav                     |   1 -
 resources/javFiles/OL.jav                         |   1 -
 .../target/generate/GenerateGenerics.java         |   1 +
 26 files changed, 9 insertions(+), 7 deletions(-)
 delete mode 100644 resources/bytecode/javFiles/Cycle.class
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestAny.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestAssign.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestClassField.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestContraVariant.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestGGFinder.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestLocalVarLambda.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestMutualRecursion.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestMutualRecursionWithField.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestMutualRecursionWithField2.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestMutualRecursionWithField3.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestReturnVar.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestSecondLineOfClassConstraints.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestTPHsAndGenerics.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestTPHsAndGenerics2.jav (98%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestThreeArgs.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestTwoArgs.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestTwoArgs2.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestTwoCalls.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestVector.jav (57%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestVectorArg.jav (100%)
 rename resources/{insertGenericsJav => insertGenerics/javFiles}/TestVoidMeth.jav (100%)

diff --git a/pom.xml b/pom.xml
index add91d5c..ade9b85d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,8 +54,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<version>3.8.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>19</source>
-                    <target>19</target>
+                    <source>20</source>
+                    <target>20</target>
                 </configuration>
 			</plugin>
 			<plugin>
@@ -112,8 +112,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		</repository>
 	</repositories>
 	<properties>
-		<maven.compiler.source>19</maven.compiler.source>
-		<maven.compiler.target>19</maven.compiler.target>
+		<maven.compiler.source>20</maven.compiler.source>
+		<maven.compiler.target>20</maven.compiler.target>
 		<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
 	</properties>
 	<distributionManagement>
diff --git a/resources/bytecode/javFiles/Cycle.class b/resources/bytecode/javFiles/Cycle.class
deleted file mode 100644
index 6bac05ecc5903680e9b75544ec6fe9d8dfabd7bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 477
zcmZut%TB^j5IsXFeF*aKwRUBzCTv{M27~NOtBW>8mY3Qfh{ceq@v~T&xX`^HrOt&$
z6YEXxJkFUpbLW11zP<rC!5%^FKgY8~0})!@R6L6IOr+!X<!GA3nL}v&#Wa)&6?c+O
zvMxcf?5K(gG!rUx0^Jb~tfEj6u_MB%+Y8S8PLX8T`v>k?p=@y0Rw``$J}<mk%%8+a
zE>k0v`}6CBU<8wKDzb+K$MthwFTDCebZCTHkcs%#7x$rT<;T0di-Fe(+4_z&tI%`g
zXeM~HB<x7XwhjgRDDmR*l)&Etjj=jsP0onDdiVlkDS0&bmbjp~@-3!KY~<w@GYaG8
l(a;|p552+ioikpKZ58wdL#7%wbCqhYvcr9AT_s0$zX2VbV<P|n

diff --git a/resources/insertGenericsJav/TestAny.jav b/resources/insertGenerics/javFiles/TestAny.jav
similarity index 100%
rename from resources/insertGenericsJav/TestAny.jav
rename to resources/insertGenerics/javFiles/TestAny.jav
diff --git a/resources/insertGenericsJav/TestAssign.jav b/resources/insertGenerics/javFiles/TestAssign.jav
similarity index 100%
rename from resources/insertGenericsJav/TestAssign.jav
rename to resources/insertGenerics/javFiles/TestAssign.jav
diff --git a/resources/insertGenericsJav/TestClassField.jav b/resources/insertGenerics/javFiles/TestClassField.jav
similarity index 100%
rename from resources/insertGenericsJav/TestClassField.jav
rename to resources/insertGenerics/javFiles/TestClassField.jav
diff --git a/resources/insertGenericsJav/TestContraVariant.jav b/resources/insertGenerics/javFiles/TestContraVariant.jav
similarity index 100%
rename from resources/insertGenericsJav/TestContraVariant.jav
rename to resources/insertGenerics/javFiles/TestContraVariant.jav
diff --git a/resources/insertGenericsJav/TestGGFinder.jav b/resources/insertGenerics/javFiles/TestGGFinder.jav
similarity index 100%
rename from resources/insertGenericsJav/TestGGFinder.jav
rename to resources/insertGenerics/javFiles/TestGGFinder.jav
diff --git a/resources/insertGenericsJav/TestLocalVarLambda.jav b/resources/insertGenerics/javFiles/TestLocalVarLambda.jav
similarity index 100%
rename from resources/insertGenericsJav/TestLocalVarLambda.jav
rename to resources/insertGenerics/javFiles/TestLocalVarLambda.jav
diff --git a/resources/insertGenericsJav/TestMutualRecursion.jav b/resources/insertGenerics/javFiles/TestMutualRecursion.jav
similarity index 100%
rename from resources/insertGenericsJav/TestMutualRecursion.jav
rename to resources/insertGenerics/javFiles/TestMutualRecursion.jav
diff --git a/resources/insertGenericsJav/TestMutualRecursionWithField.jav b/resources/insertGenerics/javFiles/TestMutualRecursionWithField.jav
similarity index 100%
rename from resources/insertGenericsJav/TestMutualRecursionWithField.jav
rename to resources/insertGenerics/javFiles/TestMutualRecursionWithField.jav
diff --git a/resources/insertGenericsJav/TestMutualRecursionWithField2.jav b/resources/insertGenerics/javFiles/TestMutualRecursionWithField2.jav
similarity index 100%
rename from resources/insertGenericsJav/TestMutualRecursionWithField2.jav
rename to resources/insertGenerics/javFiles/TestMutualRecursionWithField2.jav
diff --git a/resources/insertGenericsJav/TestMutualRecursionWithField3.jav b/resources/insertGenerics/javFiles/TestMutualRecursionWithField3.jav
similarity index 100%
rename from resources/insertGenericsJav/TestMutualRecursionWithField3.jav
rename to resources/insertGenerics/javFiles/TestMutualRecursionWithField3.jav
diff --git a/resources/insertGenericsJav/TestReturnVar.jav b/resources/insertGenerics/javFiles/TestReturnVar.jav
similarity index 100%
rename from resources/insertGenericsJav/TestReturnVar.jav
rename to resources/insertGenerics/javFiles/TestReturnVar.jav
diff --git a/resources/insertGenericsJav/TestSecondLineOfClassConstraints.jav b/resources/insertGenerics/javFiles/TestSecondLineOfClassConstraints.jav
similarity index 100%
rename from resources/insertGenericsJav/TestSecondLineOfClassConstraints.jav
rename to resources/insertGenerics/javFiles/TestSecondLineOfClassConstraints.jav
diff --git a/resources/insertGenericsJav/TestTPHsAndGenerics.jav b/resources/insertGenerics/javFiles/TestTPHsAndGenerics.jav
similarity index 100%
rename from resources/insertGenericsJav/TestTPHsAndGenerics.jav
rename to resources/insertGenerics/javFiles/TestTPHsAndGenerics.jav
diff --git a/resources/insertGenericsJav/TestTPHsAndGenerics2.jav b/resources/insertGenerics/javFiles/TestTPHsAndGenerics2.jav
similarity index 98%
rename from resources/insertGenericsJav/TestTPHsAndGenerics2.jav
rename to resources/insertGenerics/javFiles/TestTPHsAndGenerics2.jav
index 9cdc21f7..2a75e829 100644
--- a/resources/insertGenericsJav/TestTPHsAndGenerics2.jav
+++ b/resources/insertGenerics/javFiles/TestTPHsAndGenerics2.jav
@@ -10,4 +10,5 @@ class TPHsAndGenerics2 {
     m2(a, b){
         return b;
     }
+
 }
\ No newline at end of file
diff --git a/resources/insertGenericsJav/TestThreeArgs.jav b/resources/insertGenerics/javFiles/TestThreeArgs.jav
similarity index 100%
rename from resources/insertGenericsJav/TestThreeArgs.jav
rename to resources/insertGenerics/javFiles/TestThreeArgs.jav
diff --git a/resources/insertGenericsJav/TestTwoArgs.jav b/resources/insertGenerics/javFiles/TestTwoArgs.jav
similarity index 100%
rename from resources/insertGenericsJav/TestTwoArgs.jav
rename to resources/insertGenerics/javFiles/TestTwoArgs.jav
diff --git a/resources/insertGenericsJav/TestTwoArgs2.jav b/resources/insertGenerics/javFiles/TestTwoArgs2.jav
similarity index 100%
rename from resources/insertGenericsJav/TestTwoArgs2.jav
rename to resources/insertGenerics/javFiles/TestTwoArgs2.jav
diff --git a/resources/insertGenericsJav/TestTwoCalls.jav b/resources/insertGenerics/javFiles/TestTwoCalls.jav
similarity index 100%
rename from resources/insertGenericsJav/TestTwoCalls.jav
rename to resources/insertGenerics/javFiles/TestTwoCalls.jav
diff --git a/resources/insertGenericsJav/TestVector.jav b/resources/insertGenerics/javFiles/TestVector.jav
similarity index 57%
rename from resources/insertGenericsJav/TestVector.jav
rename to resources/insertGenerics/javFiles/TestVector.jav
index 1519afb7..6c8f97f0 100644
--- a/resources/insertGenericsJav/TestVector.jav
+++ b/resources/insertGenerics/javFiles/TestVector.jav
@@ -3,7 +3,9 @@ import java.util.Vector;
 public class TestVector {
 
 	m(v, w) {
-		w.addElement(id(v.elementAt(0)));
+	    var a = v.elementAt(0);
+	    var b = id(a);
+		w.addElement(b);
 	}
 	
 	id(x) {
diff --git a/resources/insertGenericsJav/TestVectorArg.jav b/resources/insertGenerics/javFiles/TestVectorArg.jav
similarity index 100%
rename from resources/insertGenericsJav/TestVectorArg.jav
rename to resources/insertGenerics/javFiles/TestVectorArg.jav
diff --git a/resources/insertGenericsJav/TestVoidMeth.jav b/resources/insertGenerics/javFiles/TestVoidMeth.jav
similarity index 100%
rename from resources/insertGenericsJav/TestVoidMeth.jav
rename to resources/insertGenerics/javFiles/TestVoidMeth.jav
diff --git a/resources/javFiles/Lambda.jav b/resources/javFiles/Lambda.jav
index 5bd67a0b..296fd7ef 100644
--- a/resources/javFiles/Lambda.jav
+++ b/resources/javFiles/Lambda.jav
@@ -10,4 +10,3 @@ public class Lambda {
    return lam1.apply(new Apply());
   }
 }
-
diff --git a/resources/javFiles/OL.jav b/resources/javFiles/OL.jav
index 66c72d53..0a3f82ec 100644
--- a/resources/javFiles/OL.jav
+++ b/resources/javFiles/OL.jav
@@ -1,4 +1,3 @@
-import java.lang.Integer;
 import java.lang.Double;
 import java.lang.String;
 import java.lang.Long;
diff --git a/src/main/java/de/dhbwstuttgart/target/generate/GenerateGenerics.java b/src/main/java/de/dhbwstuttgart/target/generate/GenerateGenerics.java
index a21ed10a..4f264e68 100644
--- a/src/main/java/de/dhbwstuttgart/target/generate/GenerateGenerics.java
+++ b/src/main/java/de/dhbwstuttgart/target/generate/GenerateGenerics.java
@@ -677,6 +677,7 @@ public abstract class GenerateGenerics {
                     if (!added) break;
                 }
 
+                System.out.println(chain + " " + chain.stream().map(e -> e.resolve().getVariance()).toList());
                 var variance = chain.get(0).resolve().getVariance();
                 if (variance != 1) continue;
                 var index = 0;