Merge branch 'bigRefactoring' into patternMatching

pom.xml

@@ -54,7 +54,12 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<version>3.11.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
+<<<<<<< HEAD
+                    <source>20</source>
+                    <target>20</target>
+=======
                     <release>20</release>
+>>>>>>> patternMatching
                 </configuration>
 			</plugin>
 			<plugin>
@@ -122,6 +127,11 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 		</repository>
 	</repositories>
 	<properties>
+<<<<<<< HEAD
+		<maven.compiler.source>20</maven.compiler.source>
+		<maven.compiler.target>20</maven.compiler.target>
+=======
+>>>>>>> patternMatching
 		<mainClass>de.dhbwstuttgart.core.ConsoleInterface</mainClass>
 	</properties>
 	<distributionManagement>

resources/AllgemeinTest/Iteration.jav

@@ -20,18 +20,24 @@ class Pair<T, U> {
 
 
 public class Iteration {
+    id(x) {
+        return x;
+    }
+
     m1(x, y) {
     	var help;
         help = m2(x, y);
         var y2 = help.snd();
-        return new Pair<>(x,y2); 
+        var x2 = id(x);
-        
+        return new Pair<>(x2,y2);
+
     }
 
     m2(x,y) {
         var help = m1(x, y);
         var x2 = help.fst();
-        return new Pair<>(x2, y);
+        var y2 = id(y);
+        return new Pair<>(x2, y2);
     }
 }
  

resources/bytecode/javFiles/OL.jav

@@ -1,4 +1,3 @@
-import java.lang.Integer;
 import java.lang.Double;
 import java.lang.String;
 import java.lang.Long;