Merge branch 'targetBytecode' of ssh://gitea.hb.dhbw-stuttgart.de:2221/JavaTX/JavaCompilerCore into targetBytecode

src/test/java/AllgemeinTest.java

.gitea/workflows/build_and_test.yml

@@ -0,0 +1,25 @@
+name: Build and Test with Maven
+on: [push]
+
+jobs:
+  Build-and-test-with-Maven:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v3
+      - name: Install maven
+        run: |
+          apt update
+          apt install -y maven
+      - name: Install java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+          cache: 'maven'
+      - name: Compile project
+        run: |
+          mvn compile
+      - name: Run tests
+        run: |
+          mvn test

pom.xml

@@ -29,14 +29,14 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 			<version>2.6</version>
 		</dependency>
 		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>22.0</version>
+			<groupId>io.github.classgraph</groupId>
+			<artifactId>classgraph</artifactId>
+			<version>4.8.172</version>
 		</dependency>
 		<dependency>
-			<groupId>org.reflections</groupId>
-			<artifactId>reflections</artifactId>
-			<version>0.9.11</version>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>33.2.0-jre</version>
 		</dependency>
 		<!-- https://mvnrepository.com/artifact/org.ow2.asm/asm -->
 		<dependency>
@@ -54,8 +54,8 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<version>3.11.0</version>
 				<configuration>
 					<compilerArgs>--enable-preview</compilerArgs>
-                    <source>20</source>
-                    <target>20</target>
+                    <source>21</source>
+                    <target>21</target>
                 </configuration>
 			</plugin>
 			<plugin>
@@ -63,9 +63,14 @@ http://maven.apache.org/maven-v4_0_0.xsd">
 				<artifactId>maven-surefire-plugin</artifactId>
 				<version>3.1.0</version>
 				<configuration>
+					<redirectTestOutputToFile>true</redirectTestOutputToFile>
+					<reportsDirectory>${project.build.directory}/test-reports</reportsDirectory>
 					<argLine>--enable-preview</argLine>
+					<trimStackTrace>false</trimStackTrace>
 					<excludes>
 						<exclude>**/JavaTXCompilerTest.java</exclude>
+						<exclude>**/AllgemeinTest.java</exclude>
+						<exclude>**/syntaxtreegenerator/*.java</exclude>
 					</excludes>
 				</configuration>
 			</plugin>

resources/AllgemeinTest/Bar.java

@@ -0,0 +1,10 @@
+public class Bar{
+
+    void visit(Object o){
+        System.out.println("Object");
+    }
+
+    void visit(Bla f){
+        System.out.println("Foo");
+    }
+}

resources/AllgemeinTest/Box.jav

@@ -0,0 +1,9 @@
+public class Box<A> {
+
+	A a;
+
+	public Box() { }
+	public Box(A a) {
+		//this.a = a;
+	}
+}

resources/AllgemeinTest/Complex.jav

@@ -0,0 +1,22 @@
+class Pair<U, T> {
+    U a;
+    T b;
+    Pair(U x, T y) {
+        a = x; b = y;
+    }
+}
+
+class Complex {
+    m(b) {
+        var c = b;
+        var d = c;
+        var e;
+        d = e;
+        var r1 = e;
+        var f = e;
+        var g;
+        f = g;
+        var r2 = g;
+        return new Pair<>(r1, r2);
+    }
+}

resources/AllgemeinTest/Foo.jav

@@ -0,0 +1,6 @@
+public class Foo{
+
+    public accept(Bar b){
+        b.visit(this);
+    }
+}

resources/AllgemeinTest/InfReturn.jav

@@ -0,0 +1,7 @@
+public class InfReturn {
+    m(a) {
+        var ret;
+        a = ret;
+        return ret;
+    }
+}

resources/AllgemeinTest/InfReturnII.jav

@@ -0,0 +1,8 @@
+public class InfReturnII {
+    m(a, b) {
+        var ret;
+        a = ret;
+        b = ret;
+        return ret;
+    }
+}

resources/AllgemeinTest/InnerInf.jav

@@ -0,0 +1,7 @@
+class InnerInf {
+    m(a, b) {
+        var i;
+        a = i;
+        b = i;
+    }
+}

resources/AllgemeinTest/Iteration.jav

@@ -1,4 +1,4 @@
-
+/*
 class Pair<T, U> {
 	T x;
 	U y;
@@ -17,7 +17,7 @@ class Pair<T, U> {
 		return y;
     }
 }
-
+*/
 
 public class Iteration {
     id(x) {

resources/AllgemeinTest/List.jav

@@ -0,0 +1,46 @@
+import java.lang.Boolean;
+import java.lang.Object;
+
+class List {
+    elem;
+    next;
+
+    List() {
+		super();
+    }
+
+    List(elem, next) {
+		this.elem = elem;
+		this.next = next;
+    }
+    
+    addElement(newElem) {
+    	return new List(newElem, this);
+    }
+    
+    append(l) {
+       if (next == null) {
+       	return l;
+       }
+       else {
+       	return new List(elem, next.append(l));
+       }
+    }
+/*
+    addAll(l) {
+		var nextLoc = next;
+		while (//nextLoc != null 
+		true) {
+	    	nextLoc = nextLoc.next;
+		}
+		nextLoc = l;
+    }
+
+    void m() {
+		List<? extends Object> l; // = new List<Integer>(1, null);
+		List<? extends Object> l2; // = new List<String>("SSS", null);
+		l.addAll(l2);
+    }
+*/
+}
+	    

resources/AllgemeinTest/Overloading.jav

@@ -0,0 +1,7 @@
+import java.lang.Integer;
+import java.lang.Double;
+
+class Overloading {
+	m(x) { return x + x; }
+	m(x) { return x || x; }
+}

resources/AllgemeinTest/RecursionCond.jav

@@ -0,0 +1,8 @@
+class RecursionCond {
+    m(a, b, c) {
+        if (1 == 2) {
+            b = m(a, b);
+            c = m(a, b);
+        } else return a;
+    }
+}

resources/AllgemeinTest/Test.jav

@@ -0,0 +1,9 @@
+import java.lang.Boolean;
+import java.lang.Integer;
+
+public class Test {
+	fac = (x) -> {
+		if (x == 1) { return 1; }
+		return x * fac.apply(x - 1);
+	};
+}

resources/AllgemeinTest/TripleTest.jav

@@ -0,0 +1,19 @@
+class Triple<U, T, S> {
+    U a;
+    T b;
+    S c;
+
+    Triple(U x, T y, S z) {
+        a = x; b = y; c = z;
+    }
+
+    U fst() { return a; }
+    T snd() { return b; }
+    S thrd() { return c; }
+}
+
+public class TripleTest {
+    m() {
+        return new Triple<>(m().thrd(), m().thrd(), m().thrd());
+    }
+}

resources/AllgemeinTest/Twice2.jav

@@ -0,0 +1,12 @@
+class Twice2 {
+	id1inst = new Id<>();
+	id1 = id1inst.id;
+	id2inst = new Id<>();
+	id2 = id2inst.id;
+    twice = id1.apply(id2);
+	    
+}
+
+class Id<T> {
+	id = (T x) -> x;
+} 

resources/bytecode/javFiles/AA.jav

@@ -2,7 +2,7 @@ import java.lang.Integer;
 import java.lang.String;
 
 public class AA {
-	m(Integer i) { return "AA"; }
+	public m(Integer i) { return "AA"; }
 	
-	m2(AA x) { return "AA"; }
+	public m2(AA x) { return "AA"; }
 }

resources/bytecode/javFiles/Access.jav

@@ -0,0 +1,14 @@
+public class Access {
+    public int fPublic;
+    int fDefault;
+    private int fPrivate;
+    protected int fProtected;
+
+    public void mPublic() {}
+    void mDefault() {}
+    private void mPrivate() {}
+    protected void mProtected() {}
+}
+
+class AccessDefault {
+}

resources/bytecode/javFiles/Annotation.jav

@@ -0,0 +1,8 @@
+class Base {
+    public void foo() {}
+}
+
+public class Annotation extends Base {
+    @Override
+    public void foo() {}
+}

resources/bytecode/javFiles/BB.jav

@@ -1,3 +1,4 @@
 import java.lang.Integer;
+import AA;
 
 public class BB extends AA { }

resources/bytecode/javFiles/BinaryInMeth.jav

@@ -3,15 +3,15 @@ import java.lang.Double;
 
 public class BinaryInMeth {
 	
-	m(a){
+	public m(a){
 		return ++a;
 	}
 	
-	m2(a,b){
+	public m2(a,b){
 		return m(a+b);
 	}
 	
-	m3(a) {
+	public m3(a) {
 		return m(++a);
 	}
 }

resources/bytecode/javFiles/Box.jav

@@ -1,7 +1,9 @@
-class B { }
-class Box_Main extends B {
-    m(b) {
-       b.m(new Box_Main());
-       b.m(new B());
+public class Box<A> {
+
+	A a;
+
+	public Box() { }
+	public Box(A a) {
+		//this.a = a;
 	}
 }

resources/bytecode/javFiles/Box.java

@@ -1,3 +0,0 @@
-class Box<A> {
-    void m(A a) { }
-}

resources/bytecode/javFiles/Bug112.jav

@@ -0,0 +1,7 @@
+public class Bug112 {
+    public m(x) {
+        var y;
+        x = y;
+        return y;
+    }
+}

resources/bytecode/javFiles/Bug122.jav

@@ -0,0 +1,12 @@
+import java.lang.Integer;
+import java.lang.Boolean;
+
+public class Bug122 {
+    public void main() {
+        if (true) {
+            for (Integer i = 0; i < 10; i++) {
+
+            }
+        }
+    }
+}

resources/bytecode/javFiles/Bug123.jav

@@ -0,0 +1,13 @@
+import java.lang.Boolean;
+import java.lang.Integer;
+
+public class Bug123 {
+    public Boolean works(){
+        if(true) return true;
+        else return false;
+    }
+    public void fails(){
+        Boolean a = true;
+        if(true) a = false;
+    }
+}

resources/bytecode/javFiles/Bug125.jav

@@ -0,0 +1,16 @@
+import java.lang.Boolean;
+import java.lang.Integer;
+import java.lang.String;
+import java.util.List;
+import java.util.LinkedList;
+import java.util.ArrayList;
+
+public class Bug125 {
+    static ArrayList<String> works = new ArrayList<>();
+    static List<String> fails = new ArrayList<>();
+
+    public void main() {
+        works.toString();
+        fails.toString();
+    }
+}

resources/bytecode/javFiles/Bug285.jav

@@ -0,0 +1,15 @@
+import java.util.Optional;
+import java.lang.Integer;
+
+public class StaticClass {
+    public static StaticClass barbar() {
+        return new StaticClass();
+    }
+}
+
+public class Bug285 {
+    public void foo() {
+        Optional<Integer> opt = Optional.empty();
+        StaticClass b = StaticClass.barbar();
+    }
+}

resources/bytecode/javFiles/Bug290A.jav

@@ -0,0 +1,7 @@
+import Bug290B;
+
+public class Bug290A {
+    public void m() {
+        new Bug290B();
+    }
+}

resources/bytecode/javFiles/Bug290B.jav

@@ -0,0 +1,11 @@
+import java.lang.String;
+import java.lang.Integer;
+
+public class Bug290B {
+    String name;
+
+    public Bug290B() {
+        Integer i = 0;
+        name = i.toString() + "$$";
+    }
+}

resources/bytecode/javFiles/Bug293.jav

@@ -0,0 +1,13 @@
+import java.lang.Integer;
+import java.lang.Float;
+
+public class Bug293 {
+    bar(a) {
+        return 2 * a;
+    }
+}
+
+interface IFoo {
+    void ga();
+}
+

resources/bytecode/javFiles/Bug295.jav

@@ -0,0 +1,18 @@
+import java.lang.Integer;
+
+public class Bug295 {
+    public Integer a;
+    public Integer b;
+    public Integer c;
+
+    public Bug295(a, b, c) {
+        this(a);
+        this.b = b;
+        this.c = c;
+    }
+
+    public Bug295(a) {
+        this.a = a;
+    }
+}
+

resources/bytecode/javFiles/Bug296.jav

@@ -0,0 +1,11 @@
+import java.lang.Integer;
+
+public class Bug296 {
+    public static m1() {
+        return m2();
+    }
+
+    static m2() {
+        return 10;
+    }
+}

resources/bytecode/javFiles/Bug297.jav

@@ -0,0 +1,11 @@
+import java.lang.Integer;
+
+public class Bug297 {
+    public static operation(func, a, b) {
+        return func.apply(a, b);
+    }
+
+    public exec() {
+        return Foo.operation((x, y) -> x + y, 10, 10);
+    }
+}

resources/bytecode/javFiles/Bug298.jav

@@ -0,0 +1,17 @@
+import java.util.List;
+import java.util.ArrayList;
+import java.lang.Integer;
+import java.lang.System;
+import java.lang.Boolean;
+import java.io.PrintStream;
+import java.util.stream.Stream;
+import java.util.function.Function;
+
+public class Bug298 {
+    public void m() {
+        List<Integer> list = new ArrayList<>();
+        list.stream().map(x -> 2 * x);
+
+        Function<Integer, Boolean> filter = x -> true;
+    }
+}

resources/bytecode/javFiles/Bug300.jav

@@ -0,0 +1,17 @@
+import java.lang.String;
+
+class Base {
+    toString() {
+        return "Base";
+    }
+}
+
+public class Bug300 extends Base {
+    public m() {
+        return super.toString();
+    }
+
+    toString() {
+        return "Derived";
+    }
+}

resources/bytecode/javFiles/Bug301.jav

@@ -0,0 +1,4 @@
+import java.util.HashSet;
+
+public class Bug301<A> extends HashSet<A> {
+}

resources/bytecode/javFiles/Bug302.jav

@@ -0,0 +1,11 @@
+import java.util.ArrayList;
+import java.util.List;
+import java.lang.Integer;
+
+public class Bug302 {
+    public Bug302(List<Integer> a){}
+
+    public static m() {
+        new Bug302(new ArrayList<Integer>());
+    }
+}

resources/bytecode/javFiles/Bug306.jav

@@ -0,0 +1,13 @@
+import java.lang.Integer;
+import java.util.List;
+
+class Base {
+    m(List<Integer> a) {}
+}
+
+public class Bug306 extends Base {
+    @Override
+    m(List<Integer> b) {
+        b.add(1);
+    }
+}

resources/bytecode/javFiles/Bug307.jav

@@ -0,0 +1,46 @@
+public class Bug307 {
+    public void main() {
+        IVisitor v = new Visitor();
+        Impl2 f = new Impl2();
+        Impl1 g = new Impl1();
+
+        f.accept(v);
+        g.accept(v);
+    }
+}
+
+interface IVisitor {
+    void visit(Impl1 f);
+    void visit(Impl2 fb);
+}
+
+interface IAcceptor {
+    void accept(IVisitor v);
+}
+
+class Visitor implements IVisitor {
+
+    @Override
+    public void visit(Impl1 f) {
+    }
+
+    @Override
+    public void visit(Impl2 fb) {
+    }
+}
+
+class Impl1 implements IAcceptor {
+
+    @Override
+    public void accept(IVisitor v) {
+        v.visit(this);
+    }
+}
+
+class Impl2 implements IAcceptor {
+
+    @Override
+    public void accept(IVisitor v) {
+        v.visit(this);
+    }
+}

resources/bytecode/javFiles/Bug309.jav

@@ -0,0 +1,16 @@
+import java.util.List;
+import java.util.ArrayList;
+import java.lang.Integer;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.util.Optional;
+
+public class Bug309 {
+    public main() {
+        List<Integer> list = new ArrayList<>(List.of(1,2,3,4,5,6,7,8,9));
+        var res = list.stream().filter(x -> x == 5).map(x -> x * 2).findFirst();
+        return res;
+    }
+}

resources/bytecode/javFiles/Bug310.jav

@@ -0,0 +1,9 @@
+import java.lang.Integer;
+import java.lang.String;
+
+public class Bug310 {
+    Integer i = 3;
+    public toString() {
+        return i.toString();
+    }
+}

resources/bytecode/javFiles/Bug311.jav

@@ -0,0 +1,10 @@
+import java.lang.String;
+
+public class Bug311 {
+    Bug311A i = new Bug311A();
+    public toString() {
+        return i.toString();
+    }
+}
+
+class Bug311A {}

resources/bytecode/javFiles/Bug312.jav

@@ -0,0 +1,8 @@
+public class Bug312 {
+    Bug312A i = new Bug312A();
+    public main() {
+        if (i == null) {}
+    }
+}
+
+class Bug312A {}

resources/bytecode/javFiles/Bug314.jav

@@ -0,0 +1,13 @@
+import java.lang.Integer;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.stream.Stream;
+import java.util.function.Predicate;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+public class Bug314 {
+    public List<Integer> convert(List<Integer> in) {
+        return in.stream().filter(x -> x > 5).collect(Collectors.toList());
+    }
+}

resources/bytecode/javFiles/Bug325.jav

@@ -0,0 +1,13 @@
+import java.lang.Integer;
+import java.util.function.Function;
+import java.util.List;
+import java.util.ArrayList;
+import java.util.stream.Stream;
+
+public class Bug325 {
+    public main() {
+      List<Integer> list = new ArrayList<>(List.of(1,2,3,4,5));
+      var func = x -> x*2;
+      return list.stream().map(func).toList();
+   }
+}

resources/bytecode/javFiles/Bug326.jav

@@ -0,0 +1,8 @@
+import java.lang.Integer;
+
+public class Bug326 {
+   public Bug326() {
+      var func = x -> y -> x * y;
+      return func.apply(3).apply(4);
+   }
+}

resources/bytecode/javFiles/Bug328.jav

@@ -0,0 +1,8 @@
+import java.lang.Integer;
+import Bug328B;
+
+public class Bug328 extends Bug328B {
+    public Bug328() {
+        super(1);
+    }
+}

resources/bytecode/javFiles/Bug328B.java

@@ -0,0 +1,3 @@
+public class Bug328B {
+    public Bug328B(int a) {}
+}

resources/bytecode/javFiles/Bug332.jav

@@ -0,0 +1,15 @@
+import java.lang.Object;
+
+interface Visitor {
+    public void visit(Object obj);
+    public void visit(ClassA a);
+}
+
+class ClassA {
+    void accept(Visitor v) {
+        v.visit(this);
+    }
+}
+
+public class Bug332 {
+}

resources/bytecode/javFiles/Bug333.jav

@@ -0,0 +1,11 @@
+import java.lang.String;
+
+public class Bug333 {
+    public static String Bar = "Bar";
+}
+
+class Bar {
+    public bar() {
+        String s = Bug333.Bar;
+    }
+}

resources/bytecode/javFiles/Bug337.jav

@@ -0,0 +1,10 @@
+import java.lang.Integer;
+import java.lang.Number;
+import java.lang.Object;
+
+public class Bug337 {
+    public void main() {
+        Fun1$$<Object, Integer> fun1 = x -> x.hashCode() + 1;
+        Fun1$$<Number, Number> fun2 = fun1;
+    }
+}

resources/bytecode/javFiles/Bug338.jav

@@ -0,0 +1,11 @@
+import java.util.List;
+import java.lang.Integer;
+import java.lang.String;
+import java.lang.Object;
+import java.util.List;
+
+public class Bug338 {
+    public hashCode() {
+        return List.of(42);
+    }
+}

resources/bytecode/javFiles/Bug343.jav

@@ -0,0 +1,2 @@
+public record Bug343() {
+}

resources/bytecode/javFiles/Bug98.jav

@@ -0,0 +1,16 @@
+import java.util.Vector;
+import java.lang.Integer;
+import java.lang.String;
+
+public class Bug98 {
+
+	public m(x, y ,z) {
+		x = new Vector<Integer>();
+		y = new Vector<String>();
+		x.add(1);
+		y.add("2");
+		//Integer i = x.elementAt(0);
+		//String s = y.elementAt(0);
+	    return 	z.vectorAddAll(x, y);
+	}
+}

resources/bytecode/javFiles/BugXXX.jav

@@ -0,0 +1,16 @@
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.lang.String;
+import java.util.stream.Stream;
+import java.util.function.Function;
+import java.util.function.Predicate;
+import java.lang.Integer;
+
+class BugXXX {
+    public main() {
+        List<Integer> i = new ArrayList<>(List.of(1,2,3,4,5,6,7,8,9,10));
+        Optional<Integer> tmp = i.stream().filter(x -> x == 5).map(x -> x*2).findFirst();
+        return tmp;
+    }
+}

resources/bytecode/javFiles/CC.jav

@@ -1,11 +1,11 @@
 import java.lang.Integer;
 import java.lang.String;
-
+import BB;
 
 public class CC extends BB {
-	m(Integer i) { 
+	public m(Integer i) {
 	   return "CC"; 
 	}
 	
-	m2(CC x) { return "CC"; }
+	public m2(CC x) { return "CC"; }
 }	

resources/bytecode/javFiles/Chain.jav

@@ -0,0 +1,13 @@
+import java.lang.Integer;
+
+public class Chain {
+    x = 5;
+
+    chain() {
+        return this;
+    }
+
+    public m() {
+        return this.chain().chain().chain().x;
+    }
+}

resources/bytecode/javFiles/Cycle.jav

@@ -1,5 +1,5 @@
-class Cycle {
-    m(x, y) {
+public class Cycle {
+    public m(x, y) {
         y = x;
         x = y;
     }

resources/bytecode/javFiles/DD.jav

@@ -1,4 +1,5 @@
 import java.lang.Integer;
+import CC;
 
 public class DD extends CC { }
 

resources/bytecode/javFiles/Exceptions.jav

@@ -1,3 +1,8 @@
+import java.lang.String;
+import java.lang.RuntimeException;
+
 public class Exceptions {
-//	m(Integer i) throws 
+    public m() {
+        throw new RuntimeException("Some Exception");
+    }
 }

resources/bytecode/javFiles/Fac.jav

@@ -1,8 +1,8 @@
 import java.lang.Integer;
 import java.lang.Double;
+import java.lang.String;
 
 public class Fac {
-	
 	getFac(n) {
 		var res = 1;
 		var i = 1;

resources/bytecode/javFiles/FieldTph2.jav

@@ -1,12 +1,14 @@
-public class FieldTph2 {
-	a;
+import java.lang.String;
 
-	m(b){
+public class FieldTph2 {
+	public a;
+	
+	public m(b){
 		b = a;
 		return b;
 	}
 	
-	m2(c){
+	public m2(c){
 		a = c;
 	}
 }

resources/bytecode/javFiles/FieldTphConsMeth.jav

@@ -1,20 +1,20 @@
 public class FieldTphConsMeth {
 	
-	a;
+	public a;
 	public FieldTphConsMeth(c) {
 		a = id(c);
 	}
 	
-	id(b) {
+	public id(b) {
 		return b;
 	}
 
-	setA(x) {
+	public setA(x) {
 	    a = x;
 	    return a;
 	}
 
-	m(x,y) {
+	public m(x,y) {
 	    x = id(y);
 	}
 

resources/bytecode/javFiles/FieldTphMMeth.jav

@@ -1,13 +1,13 @@
 import java.lang.Boolean;
 
 public class FieldTphMMeth {
-	a;
+	public a;
 	
 	public FieldTphMMeth(c,d,e) {
 		a = m(c,d,e);
 	}
 	
-	m(b,d,e) {
+	public m(b,d,e) {
 		if(e) {
 			return m3(b);
 		} else{
@@ -16,11 +16,11 @@ public class FieldTphMMeth {
 		
 	}
 	
-	m2(b) {
+	public m2(b) {
 		a = m3(b);
 	}
 	
-	m3(b){
+	public m3(b){
 		return b;
 	}
 	

resources/bytecode/javFiles/For.jav

@@ -1,23 +1,23 @@
 import java.lang.Integer;
 import java.lang.Boolean;
 
-class For{
-	Integer m(Integer x){
+public class For{
+	public Integer m(Integer x){
 		var c = x + 2;
-//		Boolean b = true;
-//		c = 5;
-//		c++;
-//		++c;
-//		c--;
-//		--c;
-//		while(x<2){
-//			x = x +1;
-//			b = false;
-//		}
-		return c;
-//		for(int i = 0;i<10;i++) {
-//			x = x + 5;
-//		}
+		Boolean b = true;
+		c = 5;
+		c++;
+		++c;
+		c--;
+		--c;
+		while(x<2){
+			x = x +1;
+			b = false;
+		}
+		for(int i = 0; i<10; i++) {
+			x = x + 5;
+		}
+		return x;
 	}
 	
 //	m2(Integer x){

resources/bytecode/javFiles/ForEach.jav

@@ -0,0 +1,23 @@
+import java.util.ArrayList;
+import java.lang.Integer;
+import java.lang.Number;
+
+public class ForEach {
+    public m() {
+        var list = new ArrayList<>();
+        list.add(1); list.add(2); list.add(3);
+
+        var sum = 0;
+        for (var i : list) {
+            sum = sum + i;
+        }
+        return sum;
+    }
+
+    public m2() {
+        var list = new ArrayList<? extends Number>();
+
+        for (Number n : list) {
+        }
+    }
+}

resources/bytecode/javFiles/FunctionalInterface.jav

@@ -0,0 +1,15 @@
+import java.lang.Integer;
+import java.util.function.Function;
+
+public class FunctionalInterface {
+    Integer accept(Function<Integer, Integer> f) {
+        return f.apply(20);
+    }
+
+    public Integer m() {
+        var v = accept(i -> {
+            return i * 10;
+        });
+        return v;
+    }
+}

resources/bytecode/javFiles/Generics2.jav

@@ -1,8 +1,8 @@
 import java.lang.String;
 import java.lang.Integer;
 
-class Generics2<B extends String>{
-	<B extends Integer> B m1(B b){
+public class Generics2<B extends String>{
+	public <X extends Integer> X m1(X b){
 		return b;
 	}
 

resources/bytecode/javFiles/HelloWorld.jav

@@ -0,0 +1,9 @@
+import java.lang.System;
+import java.lang.String;
+import java.io.PrintStream;
+
+public class HelloWorld {
+    public static hello() {
+        System.out.println("Hello World!");
+    }
+}

resources/bytecode/javFiles/ImportWildcard.jav

@@ -0,0 +1,5 @@
+import java.lang.*;
+
+public class ImportWildcard {
+    m(a, b) { return a * b; }
+}

resources/bytecode/javFiles/Inherit.jav

@@ -2,15 +2,18 @@ import java.util.Vector;
 
 import java.lang.Integer;
 import java.lang.String;
-
+import AA;
+import BB;
+import CC;
+import DD;
 
 public class Inherit {
 	
-	main(d, i) {
+	public main(d, i) {
 	  return d.m(i);
 	}
 
-	main(v, i) {
+	public main(v, i) {
 		var aa = v.elementAt(0);
 		return aa.m(i);
 	}

resources/bytecode/javFiles/Inherit2.jav

@@ -2,15 +2,18 @@ import java.util.Vector;
 
 import java.lang.Integer;
 import java.lang.String;
-
+import AA;
+import BB;
+import CC;
+import DD;
 
 public class Inherit2 {
 	
-	main(d) {
+	public main(d) {
 	  return d.m2(d);
 	}
 	
-	main(v) {
+	public main(v) {
 		var aa = v.elementAt(0);
 		return aa.m2(aa);
 	}

resources/bytecode/javFiles/InstanceOf.jav

@@ -0,0 +1,18 @@
+import java.lang.Object;
+import java.lang.Integer;
+import java.lang.Boolean;
+
+interface Interface {}
+
+class Test implements Interface {
+}
+class Test2 {
+}
+
+public class InstanceOf {
+    a = new Test();
+
+    public test1() { return this.a instanceof Test; }
+    public test2() { return this.a instanceof Interface; }
+    public test3() { return this.a instanceof Integer; }
+}

resources/bytecode/javFiles/Interfaces.jav

@@ -0,0 +1,33 @@
+import java.lang.Integer;
+
+interface A {
+    void method1();
+    default method2() {
+    }
+}
+
+interface B {
+    void method3();
+}
+
+interface C {
+    Integer myInt();
+}
+
+class ClassX implements A {
+}
+
+record ClassY(Integer myInt) implements C {}
+
+public class Interfaces implements A, B {
+    public void method1() {
+    }
+    public void method3() {
+        var intf = new Interfaces();
+        intf = new ClassX();
+        intf.method1();
+
+        C c = new ClassY(10);
+        c.myInt();
+    }
+}

resources/bytecode/javFiles/LamRunnable.jav

@@ -1,9 +0,0 @@
-public class LamRunnable{
-
-	public LamRunnable(){
-	
-		Runnable lam = () -> {System.out.println("lambda");};
-		lam.run();
-	}
-}
- 

resources/bytecode/javFiles/Lambda.jav

@@ -2,7 +2,7 @@ import java.lang.Integer;
 
 public class Lambda {
 
-  m () {
+  public m() {
    var lam1 = (x) -> {
         return x;
    };

resources/bytecode/javFiles/LambdaRunnable.jav

@@ -1,13 +1,16 @@
 import java.lang.Runnable;
 import java.lang.String;
 import java.lang.System;
+import java.io.PrintStream;
 
-public class LamRunnable{
+public class LambdaRunnable {
 
-	public LamRunnable(){
+	public LambdaRunnable(){
 
 
-		Runnable lam = () -> {System.out.println("lambda");};
+	    Runnable lam = () -> {
+	        System.out.println("Runnable is running");
+	    };
 		lam.run();
 	}
 }

resources/bytecode/javFiles/LessEqual.jav

@@ -4,52 +4,52 @@ import java.lang.Float;
 import java.lang.Double;
 
 public class LessEqual {
-	lessEqual(Integer a, Integer b){
+	public lessEqual(Integer a, Integer b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Long a, Long b){
+	public lessEqual(Long a, Long b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Float a, Float b){
+	public lessEqual(Float a, Float b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Double a, Double b){
+	public lessEqual(Double a, Double b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Long a, Integer b){
+	public lessEqual(Long a, Integer b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Float a, Integer b){
+	public lessEqual(Float a, Integer b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Double a, Integer b){
+	public lessEqual(Double a, Integer b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Float a, Long b){
+	public lessEqual(Float a, Long b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Double a, Long b){
+	public lessEqual(Double a, Long b){
 		var c = a<=b;
 		return c;
 	}
 	
-	lessEqual(Double a, Float b){
+	public lessEqual(Double a, Float b){
 		var c = a<=b;
 		return c;
 	}

resources/bytecode/javFiles/LessThan.jav

@@ -5,52 +5,52 @@ import java.lang.Double;
 
 public class LessThan {
 	
-	lessThan(Integer a, Integer b){
+	public lessThan(Integer a, Integer b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Long a, Long b){
+	public lessThan(Long a, Long b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Float a, Float b){
+	public lessThan(Float a, Float b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Double a, Double b){
+	public lessThan(Double a, Double b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Long a, Integer b){
+	public lessThan(Long a, Integer b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Float a, Integer b){
+	public lessThan(Float a, Integer b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Double a, Integer b){
+	public lessThan(Double a, Integer b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Float a, Long b){
+	public lessThan(Float a, Long b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Double a, Long b){
+	public lessThan(Double a, Long b){
 		var c = a<b;
 		return c;
 	}
 	
-	lessThan(Double a, Float b){
+	public lessThan(Double a, Float b){
 		var c = a<b;
 		return c;
 	}

resources/bytecode/javFiles/Literal.jav

@@ -0,0 +1,8 @@
+import java.lang.Character;
+
+public class Literal {
+    public m() { return null; }
+    public m2() { return 'C'; }
+    public m3() { return 10L; }
+    public m4() { return 10.5F; }
+}

resources/bytecode/javFiles/Matrix.jav

@@ -1,3 +1,5 @@
+import java.util.List;
+import java.util.AbstractList;
 import java.util.Vector;
 import java.lang.Integer;
 //import java.lang.Float;
@@ -9,7 +11,7 @@ public class Matrix    extends Vector<Vector<Integer>> {
 	Matrix () {
     }
 
-	Matrix(vv) {
+	public Matrix(vv) {
     	Integer i;
     	i = 0;
 	  while(i < vv.size()) {
@@ -19,7 +21,7 @@ public class Matrix    extends Vector<Vector<Integer>> {
 	  } 
     }
 
-    mul(m) {
+    public mul(m) {
         var ret = new Matrix();
         var i = 0;
         while(i < size()) {
@@ -30,8 +32,8 @@ public class Matrix    extends Vector<Vector<Integer>> {
                 var erg = 0;
                 var k = 0;
                 while(k < v1.size()) {
-                    erg = erg + v1.elementAt(k)
-                             * m.elementAt(k).elementAt(j);
+                    erg = erg + v1.get(k)
+                             * m.get(k).get(j);
                     k++; }
 //                v2.addElement(new Integer(erg));
                 v2.addElement(erg);

resources/bytecode/javFiles/MatrixOP.jav

@@ -8,7 +8,7 @@ public class MatrixOP    extends Vector<Vector<Integer>> {
 	MatrixOP () {
     }
 
-	MatrixOP(vv) {
+    public MatrixOP(vv) {
     	Integer i;
     	i = 0;
 	  while(i < vv.size()) {

resources/bytecode/javFiles/Merge.jav

@@ -2,16 +2,16 @@ import java.util.List;
 import java.lang.Integer;
 //import java.util.Collection;
 
-class Merge  {
+public class Merge  {
 
-	merge(a, b) {
+	public merge(a, b) {
      	a.addAll(b);
 		return a;
 	}
 
 
 
-  	sort(in){
+  	public sort(in){
 		var firstHalf = in.subList(1,2);
     	var secondHalf = in.subList(1,2);
     	return merge(sort(firstHalf), sort(secondHalf));

resources/bytecode/javFiles/OL.jav

@@ -1,13 +1,14 @@
 import java.lang.Double;
 import java.lang.String;
 import java.lang.Long;
+import java.lang.Integer;
 
-class OL {
-    m (x) { return x + x; }
+public class OL {
+    public m (x) { return x + x; }
 }
 
-class OLMain {
-	main(x) {
+public class OLMain {
+	public main(x) {
 		var ol;
 		ol = new OL();
 		return ol.m(x);

resources/bytecode/javFiles/OLConstructor.jav

@@ -0,0 +1,17 @@
+import java.lang.Integer;
+
+public class Parent {
+    public Integer x;
+
+    public Parent(Integer a) {
+        this.x = a;
+    }
+
+    public Parent() {}
+}
+
+public class Child extends Parent {
+    public Child() {
+        super(3);
+    }
+}

resources/bytecode/javFiles/Op1.jav

@@ -1,11 +1,34 @@
-public class Op1{
-	public Op1() {
+import java.lang.Boolean;
+import java.lang.Integer;
 
-		Runnable lam = () -> {
-				String test = "";
-					String b = "b";
-					test = b;
-				System.out.println(test);};
-		//lam.run();
+public class Op1 {
+	public not() {
+		var b = false;
+		var c = !b;
+		return c;
+	}
+
+	public or() {
+	    var a = 10;
+	    var b = 20;
+	    return a | b;
+	}
+
+	public and() {
+	    var a = 10;
+	    var b = 20;
+	    return a & b;
+	}
+
+    public xor() {
+        var a = 10;
+        var b = 20;
+        return a ^ b;
+    }
+
+    public mod() {
+        var a = 10;
+        var b = 2;
+        return a % b;
     }
 }

resources/bytecode/javFiles/Op2.jav

@@ -1,11 +1,17 @@
 import java.lang.Integer;
+import java.lang.Double;
 import java.lang.String;
 
 public class Op2 {
-	m(){
+	public m(){
 		var x = "";
 		var a = 5+x;
 
+		Integer x = 10;
+		Double y = 10.5;
+
+		var a = x - y;
+
 		return a;
 	}
 }

resources/bytecode/javFiles/OverloadPattern.jav

@@ -0,0 +1,50 @@
+import java.lang.Integer;
+import java.lang.Number;
+import java.lang.Float;
+
+record Point(Number x, Number y) {}
+
+public class OverloadPattern {
+    public m(Point(Integer x, Integer y)) {
+        return x + y;
+    }
+
+    public m(Point(Float x, Float y)) {
+        return x * y;
+    }
+
+    public m(Integer x) {
+        return x;
+    }
+}
+
+/*
+public class OverloadPattern {
+    Integer m$Point$_$java$lang$Integer$_$java$lang$Integer$_$(Point point) {
+        var x = point.x();
+        var y = point.y();
+        return x + y;
+    }
+
+    Float m$Point$_$java$lang$Float$_$java$lang$Float$_$(Point point) {
+        var x = point.x();
+        var y = point.y();
+        return x * y;
+    }
+
+    Number m(Point point) {
+        return switch(point) {
+            case Point(Integer x, Integer y) ->
+                m$Point$_$java$lang$Integer$_$java$lang$Integer$_$(point);
+            case Point(Float x, Float y) ->
+                m$Point$_$java$lang$Float$_$java$lang$Float$_$(point);
+            default -> throw new IllegalArgumentException();
+        }
+    }
+
+    Integer m(Integer x) {
+        return x;
+    }
+}
+
+*/

resources/bytecode/javFiles/Overloading.jav

@@ -2,17 +2,17 @@ import java.lang.String;
 
 public class Overloading{
 
-	test(x){
+	public test(x){
 		return x.methode();
 	}
 
-	methode(){
+	public methode(){
 		return "Overloading";
 	}
 }
 
 public class Overloading2{
-	methode(){
+	public methode(){
 		return "Overloading2";
 	}
 }

resources/bytecode/javFiles/OverrideEquals.jav

@@ -0,0 +1,12 @@
+import java.lang.Object;
+import java.lang.Boolean;
+
+public class OverrideEquals extends OverrideRoot {
+    public boolean equals(Object o) {
+        return true;
+    }
+
+    public int method(int var1, float var2) {
+        return 0;
+    }
+}

resources/bytecode/javFiles/OverrideRoot.java

@@ -0,0 +1,3 @@
+public abstract class OverrideRoot {
+    public abstract int method(int a, float b);
+}

resources/bytecode/javFiles/Pair.jav

@@ -2,31 +2,16 @@ import java.util.Vector;
 import java.lang.Boolean;
 import java.lang.Object;
 
-class Pair<U, T> {
-    U a;
-    T b;
 
-    make(x) {
-		var ret = new Pair<>();
-		ret.a = x.elementAt(0);
-		ret.b = x.elementAt(1);
-		return ret;
-    }
- /*
-    eq(a, b) {
-    	b = a;
-    	return a == b;
+public class Pair<T, U> {
+	T x;
+	U y;
+
+	public fst() {
+		return x;
 	}
 
-    compare( p) {
-		return  eq(p.a, p.b);
-		//return p.a == p.b;
+	public snd() {
+		return y;
     }
-
-    void m(Pair<?, ?> p, List<? extends Eq> b)
-    {
-	//this.compare(p); //1, type incorrect
-	this.compare(this.make(b)); //2, OK
-    }
-*/
 }

resources/bytecode/javFiles/Plus.jav

@@ -3,7 +3,7 @@ import java.lang.String;
 
 public class Plus {
 	
-	m(a,b) {
+	public m(a,b) {
 		return a+b;
 	}
 }

resources/bytecode/javFiles/PostIncDec.jav

@@ -1,25 +1,25 @@
 import java.lang.Integer;
 
 public class PostIncDec {
-	m() {
+	public m() {
 		var i = 0;
 		i++;
 		return i;
 	}
 	
-	m2() { 
+	public m2() {
 		var i = 0;
 		var j = i++;
 		return j;
 	}
 	
-	d() {
+	public d() {
 		var i = 0;
 		i--;
 		return i;
 	}
 	
-	d2() { 
+	public d2() {
 		var i = 0;
 		var j = i--;
 		return j;

resources/bytecode/javFiles/PreInc.jav

@@ -1,25 +1,25 @@
 import java.lang.Integer;
 
 public class PreInc {
-	m() {
+	public m() {
 		var i = 0;
 		++i;
 		return i;
 	}
 	
-	m2() { 
+	public m2() {
 		var i = 0;
 		var j = ++i;
 		return j;
 	}
 	
-	d() {
+	public d() {
 		var i = 0;
 		--i;
 		return i;
 	}
 	
-	d2() { 
+	public d2() {
 		var i = 0;
 		var j = --i;
 		return j;